fix(secret): set project_id as optional in datasources (#2738)

* fix(secret): set project_id as optional in datasources

* fix: set project_id to ptr in API creation helpers

Author: Codelax

internal/services/secret/helpers.go

@@ -33,37 +33,39 @@ func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*secret.API, scw.R
 }
 
 // newAPIWithRegionAndDefault returns a new Secret API and the region for a Create request
-func newAPIWithRegionProjectIDAndDefault(d *schema.ResourceData, m interface{}, defaultRegion scw.Region) (*secret.API, scw.Region, string, error) {
+func newAPIWithRegionOptionalProjectIDAndDefault(d *schema.ResourceData, m interface{}, defaultRegion scw.Region) (*secret.API, scw.Region, *string, error) {
 	api := secret.NewAPI(meta.ExtractScwClient(m))
 
 	region, err := meta.ExtractRegionWithDefault(d, m, defaultRegion)
 	if err != nil {
-		return nil, "", "", err
+		return nil, "", nil, err
 	}
 
+	var projectIDPtr *string
 	projectID, _, err := meta.ExtractProjectID(d, m)
-	if err != nil {
-		return nil, "", "", err
+	if err == nil {
+		projectIDPtr = &projectID
 	}
 
-	return api, region, projectID, nil
+	return api, region, projectIDPtr, nil
 }
 
 // newAPIWithRegionAndProjectID returns a new Secret API, with region and projectID
-func newAPIWithRegionAndProjectID(d *schema.ResourceData, m interface{}) (*secret.API, scw.Region, string, error) {
+func newAPIWithRegionAndProjectID(d *schema.ResourceData, m interface{}) (*secret.API, scw.Region, *string, error) {
 	api := secret.NewAPI(meta.ExtractScwClient(m))
 
 	region, err := meta.ExtractRegion(d, m)
 	if err != nil {
-		return nil, "", "", err
+		return nil, "", nil, err
 	}
 
+	var projectIDPtr *string
 	projectID, _, err := meta.ExtractProjectID(d, m)
-	if err != nil {
-		return nil, "", "", err
+	if err == nil {
+		projectIDPtr = &projectID
 	}
 
-	return api, region, projectID, nil
+	return api, region, projectIDPtr, nil
 }
 
 // NewAPIWithRegionAndID returns a Secret API with locality and ID extracted from the state

internal/services/secret/secret_data_source.go

@@ -55,7 +55,7 @@ func DataSourceSecretRead(ctx context.Context, d *schema.ResourceData, m interfa
 		request := &secret.ListSecretsRequest{
 			Region:         region,
 			Name:           types.ExpandStringPtr(secretName),
-			ProjectID:      types.ExpandStringPtr(projectID),
+			ProjectID:      projectID,
 			OrganizationID: types.ExpandStringPtr(d.Get("organization_id")),
 			Path:           types.ExpandStringPtr(d.Get("path")),
 		}