fix(secret_version): data source get region from secret_id (#2121)

Co-authored-by: jaime Bernabe <[email protected]>

Author: Codelax

scaleway/data_source_secret_version.go

@@ -44,15 +44,15 @@ func dataSourceScalewaySecretVersion() *schema.Resource {
 }
 
 func datasourceSchemaFromResourceVersionSchema(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	api, region, err := secretAPIWithRegion(d, meta)
+	secretID, existSecretID := d.GetOk("secret_id")
+	api, region, err := secretAPIWithRegionAndDefault(d, meta, expandRegionalID(secretID).Region)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
 	var secretVersionIDStr string
 	var payloadSecretRaw []byte
 
-	secretID, existSecretID := d.GetOk("secret_id")
 	if !existSecretID {
 		request := &secret.AccessSecretVersionByNameRequest{
 			Region:     region,

scaleway/helpers.go

@@ -249,6 +249,28 @@ func extractRegion(d terraformResourceData, meta *Meta) (scw.Region, error) {
 	return "", ErrRegionNotFound
 }
 
+// extractRegion will try to guess the region from the following:
+//   - region field of the resource data
+//   - default region given in argument
+//   - default region from config
+func extractRegionWithDefault(d terraformResourceData, meta *Meta, defaultRegion scw.Region) (scw.Region, error) {
+	rawRegion, exist := d.GetOk("region")
+	if exist {
+		return scw.ParseRegion(rawRegion.(string))
+	}
+
+	if defaultRegion != "" {
+		return defaultRegion, nil
+	}
+
+	region, exist := meta.scwClient.GetDefaultRegion()
+	if exist {
+		return region, nil
+	}
+
+	return "", ErrRegionNotFound
+}
+
 // ErrProjectIDNotFound is returned when no region can be detected
 var ErrProjectIDNotFound = fmt.Errorf("could not detect project id")
 

scaleway/helpers_secret.go

@@ -25,6 +25,18 @@ func secretAPIWithRegion(d *schema.ResourceData, m interface{}) (*secret.API, sc
 	return api, region, nil
 }
 
+// secretAPIWithRegionAndDefault returns a new Secret API and the region for a Create request
+func secretAPIWithRegionAndDefault(d *schema.ResourceData, m interface{}, defaultRegion scw.Region) (*secret.API, scw.Region, error) {
+	meta := m.(*Meta)
+	api := secret.NewAPI(meta.scwClient)
+
+	region, err := extractRegionWithDefault(d, meta, defaultRegion)
+	if err != nil {
+		return nil, "", err
+	}
+	return api, region, nil
+}
+
 // secretAPIWithRegionAndProjectID returns a new Secret API, with region and projectID
 func secretAPIWithRegionAndProjectID(d *schema.ResourceData, m interface{}) (*secret.API, scw.Region, string, error) {
 	meta := m.(*Meta)