fix(region): skip sync meta if no public cloud register (#18827)

yunionio · Nov 30, 2023 · a5c5f4f · a5c5f4f
1 parent df71fdd
commit a5c5f4f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 2 deletions.
diff --git a/pkg/compute/models/cloudimages.go b/pkg/compute/models/cloudimages.go
@@ -72,6 +72,10 @@ func SyncPublicCloudImages(ctx context.Context, userCred mcclient.TokenCredentia
 		return
 	}
 
+	if len(regions) == 0 {
+		return
+	}
+
 	meta, err := yunionmeta.FetchYunionmeta(ctx)
 	if err != nil {
 		log.Errorf("FetchYunionmeta %v", err)

diff --git a/pkg/compute/models/dbinstance_skus.go b/pkg/compute/models/dbinstance_skus.go
@@ -651,6 +651,9 @@ func SyncRegionDBInstanceSkus(ctx context.Context, userCred mcclient.TokenCreden
 		log.Errorf("failed to fetch cloudregions: %v", err)
 		return
 	}
+	if len(cloudregions) == 0 {
+		return
+	}
 
 	meta, err := yunionmeta.FetchYunionmeta(ctx)
 	if err != nil {

diff --git a/pkg/compute/models/elasticcache_skus.go b/pkg/compute/models/elasticcache_skus.go
@@ -806,6 +806,10 @@ func SyncElasticCacheSkus(ctx context.Context, userCred mcclient.TokenCredential
 			return
 		}
 	}
+	cloudregions := fetchSkuSyncCloudregions()
+	if len(cloudregions) == 0 {
+		return
+	}
 
 	meta, err := yunionmeta.FetchYunionmeta(ctx)
 	if err != nil {
@@ -819,7 +823,6 @@ func SyncElasticCacheSkus(ctx context.Context, userCred mcclient.TokenCredential
 		return
 	}
 
-	cloudregions := fetchSkuSyncCloudregions()
 	for i := range cloudregions {
 		region := &cloudregions[i]
 

diff --git a/pkg/compute/models/nas_skus.go b/pkg/compute/models/nas_skus.go
@@ -347,6 +347,10 @@ func SyncRegionNasSkus(ctx context.Context, userCred mcclient.TokenCredential, r
 		return errors.Wrapf(err, "db.FetchModelObjects")
 	}
 
+	if len(regions) == 0 {
+		return nil
+	}
+
 	meta, err := yunionmeta.FetchYunionmeta(ctx)
 	if err != nil {
 		return errors.Wrapf(err, "FetchYunionmeta")

diff --git a/pkg/compute/models/nat_skus.go b/pkg/compute/models/nat_skus.go
@@ -350,6 +350,9 @@ func SyncRegionNatSkus(ctx context.Context, userCred mcclient.TokenCredential, r
 	if err != nil {
 		return errors.Wrapf(err, "db.FetchModelObjects")
 	}
+	if len(regions) == 0 {
+		return nil
+	}
 
 	meta, err := yunionmeta.FetchYunionmeta(ctx)
 	if err != nil {

diff --git a/pkg/compute/models/server_skus.go b/pkg/compute/models/server_skus.go
@@ -1600,6 +1600,10 @@ func SyncServerSkus(ctx context.Context, userCred mcclient.TokenCredential, isSt
 			return
 		}
 	}
+	cloudregions := fetchSkuSyncCloudregions()
+	if len(cloudregions) == 0 {
+		return
+	}
 
 	meta, err := yunionmeta.FetchYunionmeta(ctx)
 	if err != nil {
@@ -1613,7 +1617,6 @@ func SyncServerSkus(ctx context.Context, userCred mcclient.TokenCredential, isSt
 		return
 	}
 
-	cloudregions := fetchSkuSyncCloudregions()
 	for i := range cloudregions {
 		region := &cloudregions[i]
 

diff --git a/pkg/compute/models/waf_rule_groups.go b/pkg/compute/models/waf_rule_groups.go
@@ -308,6 +308,10 @@ func SyncWafGroups(ctx context.Context, userCred mcclient.TokenCredential, isSta
 			return errors.Wrapf(err, "fetchCloudEnvs")
 		}
 
+		if len(cloudEnvs) == 0 {
+			return nil
+		}
+
 		meta, err := yunionmeta.FetchYunionmeta(ctx)
 		if err != nil {
 			return errors.Wrapf(err, "FetchYunionmeta")