feat: code improvements based on SonarCloud findings for the Api-Cred…

…ential Resources (#950)

docs/resources/directory_api_credential.md

@@ -33,16 +33,12 @@ resource "btp_directory_api_credential" "with-secret" {
   read_only = false
 }
 
-// This datasource runs a go script to dynamically generate a PEM certificate which is used in the resource below
-data "external" "values" {
-  program = ["go","run","../certificate.go"]
-}
 
 # Create a certificate type API credential at the directory level
 resource "btp_directory_api_credential" "with-certificate" {
   name = "directory-api-credential-with-certificate"
   directory_id = "d1298936-ddaf-4a82-b1d7-3ad29a732b61"
-  certificate_passed = data.external.values.result["certificate"]
+  certificate_passed = "-----BEGIN CERTIFICATE-----\n-not-a-valid-certificate-\n-----END CERTIFICATE----\n"
   read_only = false
 }
 

docs/resources/globalaccount_api_credential.md

@@ -32,15 +32,10 @@ resource "btp_globalaccount_api_credential" "with-secret" {
   read_only = false
 }
 
-// This datasource runs a go script to dynamically generate a PEM certificate which is used in the resource below
-data "external" "values" {
-  program = ["go","run","../certificate.go"]
-}
-
 # Create a certificate type API credential at the globalaccount level
 resource "btp_globalaccount_api_credential" "with-certificate" {
   name = "globalaccount-api-credential-with-certificate"
-  certificate_passed = data.external.values.result["certificate"]
+  certificate_passed = "-----BEGIN CERTIFICATE-----\n-not-a-valid-certificate-\n-----END CERTIFICATE----\n"
   read_only = false
 }
 

docs/resources/subaccount_api_credential.md

@@ -33,16 +33,12 @@ resource "btp_subaccount_api_credential" "with-secret" {
   read_only = false
 }
 
-// This datasource runs a go script to dynamically generate a PEM certificate which is used in the resource below
-data "external" "values" {
-  program = ["go","run","../certificate.go"]
-}
 
 # Create a certificate type API credential at the subaccount level
 resource "btp_subaccount_api_credential" "with-certificate" {
   name = "subaccount-api-credential-with-certificate"
   subaccount_id = "77395f6a-a601-4c9e-8cd0-c1fcefc7f60f"
-  certificate_passed = data.external.values.result["certificate"]
+  certificate_passed = "-----BEGIN CERTIFICATE-----\n-not-a-valid-certificate-\n-----END CERTIFICATE----\n"
   read_only = false
 }
 

examples/resources/btp_directory_api_credential/resource.tf

@@ -5,16 +5,12 @@ resource "btp_directory_api_credential" "with-secret" {
   read_only = false
 }
 
-// This datasource runs a go script to dynamically generate a PEM certificate which is used in the resource below
-data "external" "values" {
-  program = ["go","run","../certificate.go"]
-}
 
 # Create a certificate type API credential at the directory level
 resource "btp_directory_api_credential" "with-certificate" {
   name = "directory-api-credential-with-certificate"
   directory_id = "d1298936-ddaf-4a82-b1d7-3ad29a732b61"
-  certificate_passed = data.external.values.result["certificate"]
+  certificate_passed = "-----BEGIN CERTIFICATE-----\n-not-a-valid-certificate-\n-----END CERTIFICATE----\n"
   read_only = false
 }
 

examples/resources/btp_globalaccount_api_credential/resource.tf

@@ -4,15 +4,10 @@ resource "btp_globalaccount_api_credential" "with-secret" {
   read_only = false
 }
 
-// This datasource runs a go script to dynamically generate a PEM certificate which is used in the resource below
-data "external" "values" {
-  program = ["go","run","../certificate.go"]
-}
-
 # Create a certificate type API credential at the globalaccount level
 resource "btp_globalaccount_api_credential" "with-certificate" {
   name = "globalaccount-api-credential-with-certificate"
-  certificate_passed = data.external.values.result["certificate"]
+  certificate_passed = "-----BEGIN CERTIFICATE-----\n-not-a-valid-certificate-\n-----END CERTIFICATE----\n"
   read_only = false
 }
 

examples/resources/btp_subaccount_api_credential/resource.tf

@@ -5,16 +5,12 @@ resource "btp_subaccount_api_credential" "with-secret" {
   read_only = false
 }
 
-// This datasource runs a go script to dynamically generate a PEM certificate which is used in the resource below
-data "external" "values" {
-  program = ["go","run","../certificate.go"]
-}
 
 # Create a certificate type API credential at the subaccount level
 resource "btp_subaccount_api_credential" "with-certificate" {
   name = "subaccount-api-credential-with-certificate"
   subaccount_id = "77395f6a-a601-4c9e-8cd0-c1fcefc7f60f"
-  certificate_passed = data.external.values.result["certificate"]
+  certificate_passed = "-----BEGIN CERTIFICATE-----\n-not-a-valid-certificate-\n-----END CERTIFICATE----\n"
   read_only = false
 }
 

internal/btpcli/facade_security_api_credential.go

@@ -28,101 +28,71 @@ type ApiCredentialInput struct {
 	ReadOnly      bool   `btpcli:"readOnly,omitempty"`
 }
 
-func (f *securityApiCredentialFacade) CreateBySubaccount(ctx context.Context, args *ApiCredentialInput) (xsuaa_api.ApiCredentialSubaccount, CommandResponse, error) {
+func (f *securityApiCredentialFacade) CreateByDirectoryorSubaccount(ctx context.Context, args *ApiCredentialInput) (xsuaa_api.ApiCredential, CommandResponse, error) {
 	params, err := tfutils.ToBTPCLIParamsMap(args)
 
 	if err != nil {
-		return xsuaa_api.ApiCredentialSubaccount{}, CommandResponse{}, err
+		return xsuaa_api.ApiCredential{}, CommandResponse{}, err
 	}
 
-	return doExecute[xsuaa_api.ApiCredentialSubaccount](f.cliClient, ctx, NewCreateRequest(f.getCommand(), params))
+	return doExecute[xsuaa_api.ApiCredential](f.cliClient, ctx, NewCreateRequest(f.getCommand(), params))
 }
 
-func (f *securityApiCredentialFacade) DeleteBySubaccount(ctx context.Context, args *ApiCredentialInput) (xsuaa_api.ApiCredentialSubaccount, CommandResponse, error) {
+func (f *securityApiCredentialFacade) DeleteByDirectoryorSubaccount(ctx context.Context, args *ApiCredentialInput) (xsuaa_api.ApiCredential, CommandResponse, error) {
 	params, err := tfutils.ToBTPCLIParamsMap(args)
 
 	if err != nil {
-		return xsuaa_api.ApiCredentialSubaccount{}, CommandResponse{}, err
+		return xsuaa_api.ApiCredential{}, CommandResponse{}, err
 	}
 
-	return doExecute[xsuaa_api.ApiCredentialSubaccount](f.cliClient, ctx, NewDeleteRequest(f.getCommand(), params))
+	return doExecute[xsuaa_api.ApiCredential](f.cliClient, ctx, NewDeleteRequest(f.getCommand(), params))
 }
 
-func (f *securityApiCredentialFacade) GetBySubaccount(ctx context.Context, args *ApiCredentialInput) (xsuaa_api.ApiCredentialSubaccount, CommandResponse, error) {
+func (f *securityApiCredentialFacade) GetByDirectoryorSubaccount(ctx context.Context, args *ApiCredentialInput) (xsuaa_api.ApiCredential, CommandResponse, error) {
 	params, err := tfutils.ToBTPCLIParamsMap(args)
 
 	if err != nil {
-		return xsuaa_api.ApiCredentialSubaccount{}, CommandResponse{}, err
+		return xsuaa_api.ApiCredential{}, CommandResponse{}, err
 	}
 
-	return doExecute[xsuaa_api.ApiCredentialSubaccount](f.cliClient, ctx, NewGetRequest(f.getCommand(), params))
+	return doExecute[xsuaa_api.ApiCredential](f.cliClient, ctx, NewGetRequest(f.getCommand(), params))
 }
 
-func (f *securityApiCredentialFacade) CreateByDirectory(ctx context.Context, args *ApiCredentialInput) (xsuaa_api.ApiCredentialSubaccount, CommandResponse, error) {
-	params, err := tfutils.ToBTPCLIParamsMap(args)
-
-	if err != nil {
-		return xsuaa_api.ApiCredentialSubaccount{}, CommandResponse{}, err
-	}
-
-	return doExecute[xsuaa_api.ApiCredentialSubaccount](f.cliClient, ctx, NewCreateRequest(f.getCommand(), params))
-}
-
-func (f *securityApiCredentialFacade) DeleteByDirectory(ctx context.Context, args *ApiCredentialInput) (xsuaa_api.ApiCredentialSubaccount, CommandResponse, error) {
-	params, err := tfutils.ToBTPCLIParamsMap(args)
-
-	if err != nil {
-		return xsuaa_api.ApiCredentialSubaccount{}, CommandResponse{}, err
-	}
-
-	return doExecute[xsuaa_api.ApiCredentialSubaccount](f.cliClient, ctx, NewDeleteRequest(f.getCommand(), params))
-}
-
-func (f *securityApiCredentialFacade) GetByDirectory(ctx context.Context, args *ApiCredentialInput) (xsuaa_api.ApiCredentialSubaccount, CommandResponse, error) {
-	params, err := tfutils.ToBTPCLIParamsMap(args)
-
-	if err != nil {
-		return xsuaa_api.ApiCredentialSubaccount{}, CommandResponse{}, err
-	}
-
-	return doExecute[xsuaa_api.ApiCredentialSubaccount](f.cliClient, ctx, NewGetRequest(f.getCommand(), params))
-}
-
-func (f *securityApiCredentialFacade) CreateByGlobalAccount(ctx context.Context, args *ApiCredentialInput) (xsuaa_api.ApiCredentialSubaccount, CommandResponse, error) {
+func (f *securityApiCredentialFacade) CreateByGlobalAccount(ctx context.Context, args *ApiCredentialInput) (xsuaa_api.ApiCredential, CommandResponse, error) {
 
 	args.GlobalAccount = f.cliClient.GetGlobalAccountSubdomain()
 
 	params, err := tfutils.ToBTPCLIParamsMap(args)
 
 	if err != nil {
-		return xsuaa_api.ApiCredentialSubaccount{}, CommandResponse{}, err
+		return xsuaa_api.ApiCredential{}, CommandResponse{}, err
 	}
 
-	return doExecute[xsuaa_api.ApiCredentialSubaccount](f.cliClient, ctx, NewCreateRequest(f.getCommand(), params))
+	return doExecute[xsuaa_api.ApiCredential](f.cliClient, ctx, NewCreateRequest(f.getCommand(), params))
 }
 
-func (f *securityApiCredentialFacade) DeleteByGlobalAccount(ctx context.Context, args *ApiCredentialInput) (xsuaa_api.ApiCredentialSubaccount, CommandResponse, error) {
+func (f *securityApiCredentialFacade) DeleteByGlobalAccount(ctx context.Context, args *ApiCredentialInput) (xsuaa_api.ApiCredential, CommandResponse, error) {
 
 	args.GlobalAccount = f.cliClient.GetGlobalAccountSubdomain()
 
 	params, err := tfutils.ToBTPCLIParamsMap(args)
 
 	if err != nil {
-		return xsuaa_api.ApiCredentialSubaccount{}, CommandResponse{}, err
+		return xsuaa_api.ApiCredential{}, CommandResponse{}, err
 	}
 
-	return doExecute[xsuaa_api.ApiCredentialSubaccount](f.cliClient, ctx, NewDeleteRequest(f.getCommand(), params))
+	return doExecute[xsuaa_api.ApiCredential](f.cliClient, ctx, NewDeleteRequest(f.getCommand(), params))
 }
 
-func (f *securityApiCredentialFacade) GetByGlobalAccount(ctx context.Context, args *ApiCredentialInput) (xsuaa_api.ApiCredentialSubaccount, CommandResponse, error) {
+func (f *securityApiCredentialFacade) GetByGlobalAccount(ctx context.Context, args *ApiCredentialInput) (xsuaa_api.ApiCredential, CommandResponse, error) {
 
 	args.GlobalAccount = f.cliClient.GetGlobalAccountSubdomain()
 
 	params, err := tfutils.ToBTPCLIParamsMap(args)
 
 	if err != nil {
-		return xsuaa_api.ApiCredentialSubaccount{}, CommandResponse{}, err
+		return xsuaa_api.ApiCredential{}, CommandResponse{}, err
 	}
 
-	return doExecute[xsuaa_api.ApiCredentialSubaccount](f.cliClient, ctx, NewGetRequest(f.getCommand(), params))
+	return doExecute[xsuaa_api.ApiCredential](f.cliClient, ctx, NewGetRequest(f.getCommand(), params))
 }