fix(secret): do not use default project id in secret datasource

Author: Codelax

internal/services/secret/helpers.go

@@ -50,20 +50,15 @@ func newAPIWithRegionProjectIDAndDefault(d *schema.ResourceData, m interface{},
 }
 
 // newAPIWithRegionAndProjectID returns a new Secret API, with region and projectID
-func newAPIWithRegionAndProjectID(d *schema.ResourceData, m interface{}) (*secret.API, scw.Region, string, error) {
+func newAPIWithRegionAndDefault(d *schema.ResourceData, m interface{}) (*secret.API, scw.Region, error) {
 	api := secret.NewAPI(meta.ExtractScwClient(m))
 
 	region, err := meta.ExtractRegion(d, m)
 	if err != nil {
-		return nil, "", "", err
-	}
-
-	projectID, _, err := meta.ExtractProjectID(d, m)
-	if err != nil {
-		return nil, "", "", err
+		return nil, "", err
 	}
 
-	return api, region, projectID, nil
+	return api, region, nil
 }
 
 // NewAPIWithRegionAndID returns a Secret API with locality and ID extracted from the state

internal/services/secret/secret_data_source.go

@@ -44,7 +44,7 @@ func DataSourceSecret() *schema.Resource {
 }
 
 func DataSourceSecretRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	api, region, projectID, err := newAPIWithRegionAndProjectID(d, m)
+	api, region, err := newAPIWithRegionAndDefault(d, m)
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -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:      types.ExpandStringPtr(d.Get("project_id")),
 			OrganizationID: types.ExpandStringPtr(d.Get("organization_id")),
 			Path:           types.ExpandStringPtr(d.Get("path")),
 		}

internal/services/secret/secret_data_source_test.go

@@ -1,60 +1,55 @@
 package secret_test
 
 import (
-	"context"
 	"fmt"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
-	"github.com/stretchr/testify/require"
 )
 
 func TestAccDataSourceSecret_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 
-	ctx := context.Background()
 	secretName := "scalewayDataSourceSecret"
-	project, iamAPIKey, terminateFakeSideProject, err := acctest.CreateFakeIAMManager(tt)
-	require.NoError(t, err)
 
 	resource.ParallelTest(t, resource.TestCase{
-		ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey),
-		CheckDestroy: resource.ComposeAggregateTestCheckFunc(
-			func(_ *terraform.State) error {
-				return terminateFakeSideProject()
-			},
-			testAccCheckSecretDestroy(tt),
-		),
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      testAccCheckSecretDestroy(tt),
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
+					resource "scaleway_account_project" "project" {}
+
 					resource "scaleway_secret" "main" {
 					  name        = "%[1]s"
 					  description = "DataSourceSecret test description"
-					  project_id  = "%[3]s"
+					  project_id  = scaleway_account_project.project.id
 					}
 					
 					data "scaleway_secret" "by_name" {
 					  name            = scaleway_secret.main.name
-					  organization_id = "%[2]s"
-					  project_id      = "%[3]s"
 					}
 					
 					data "scaleway_secret" "by_id" {
 					  secret_id       = scaleway_secret.main.id
-					  organization_id = "%[2]s"
-					  project_id      = "%[3]s"
 					}
-				`, secretName, project.OrganizationID, project.ID),
+
+					data "scaleway_secret" "with_project_id" {
+					  name            = scaleway_secret.main.name
+					  project_id      = scaleway_account_project.project.id
+					}
+				`, secretName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckSecretExists(tt, "data.scaleway_secret.by_name"),
 					resource.TestCheckResourceAttr("data.scaleway_secret.by_name", "name", secretName),
 
 					testAccCheckSecretExists(tt, "data.scaleway_secret.by_id"),
 					resource.TestCheckResourceAttr("data.scaleway_secret.by_id", "name", secretName),
+
+					testAccCheckSecretExists(tt, "data.scaleway_secret.with_project_id"),
+					resource.TestCheckResourceAttr("data.scaleway_secret.with_project_id", "name", secretName),
 				),
 			},
 		},