review changes 2

Signed-off-by: Mauritz Uphoff <[email protected]>

Author: h3adex

docs/ephemeral-resources/access_token.md

@@ -3,12 +3,12 @@
 page_title: "stackit_access_token Ephemeral Resource - stackit"
 subcategory: ""
 description: |-
-  STACKIT Access Token ephemeral resource schema.
+  Ephemeral resource that generates a short-lived STACKIT access token (JWT) using a service account key. A new token is generated each time the resource is evaluated, and it remains consistent for the duration of a Terraform operation. If a private key is not explicitly provided, the provider attempts to extract it from the service account key instead. Token generation logic prioritizes environment variables first, followed by provider configuration. Access tokens generated from service account keys expire after 60 minutes.
 ---
 
 # stackit_access_token (Ephemeral Resource)
 
-STACKIT Access Token ephemeral resource schema.
+Ephemeral resource that generates a short-lived STACKIT access token (JWT) using a service account key. A new token is generated each time the resource is evaluated, and it remains consistent for the duration of a Terraform operation. If a private key is not explicitly provided, the provider attempts to extract it from the service account key instead. Token generation logic prioritizes environment variables first, followed by provider configuration. Access tokens generated from service account keys expire after 60 minutes.
 
 ## Example Usage
 
@@ -18,16 +18,16 @@ ephemeral "stackit_access_token" "example" {}
 // https://registry.terraform.io/providers/Mastercard/restapi/latest/docs
 provider "restapi" {
   alias                = "stackit_iaas"
-  uri                  = "https://iaas.api.eu01.stackit.cloud"
+  uri                  = "https://iaas.api.eu01.stackit.cloud/v2"
   write_returns_object = true
 
   headers = {
     "Authorization" = "Bearer ${ephemeral.stackit_access_token.example.access_token}"
   }
 
-  create_method  = "GET"
-  update_method  = "GET"
-  destroy_method = "GET"
+  create_method  = "POST"
+  update_method  = "PUT"
+  destroy_method = "DELETE"
 }
 ```
 

examples/ephemeral-resources/stackit_access_token/ephemeral-resource.tf

@@ -3,14 +3,14 @@ ephemeral "stackit_access_token" "example" {}
 // https://registry.terraform.io/providers/Mastercard/restapi/latest/docs
 provider "restapi" {
   alias                = "stackit_iaas"
-  uri                  = "https://iaas.api.eu01.stackit.cloud"
+  uri                  = "https://iaas.api.eu01.stackit.cloud/v2"
   write_returns_object = true
 
   headers = {
     "Authorization" = "Bearer ${ephemeral.stackit_access_token.example.access_token}"
   }
 
-  create_method  = "GET"
-  update_method  = "GET"
-  destroy_method = "GET"
+  create_method  = "POST"
+  update_method  = "PUT"
+  destroy_method = "DELETE"
 }

stackit/internal/conversion/conversion.go

@@ -184,7 +184,6 @@ func ParseProviderData(ctx context.Context, providerData any, diags *diag.Diagno
 	return stackitProviderData, true
 }
 
-// TODO: write tests
 func ParseEphemeralProviderData(ctx context.Context, providerData any, diags *diag.Diagnostics) (core.EphemeralProviderData, bool) {
 	// Prevent panic if the provider has not been configured.
 	if providerData == nil {

stackit/internal/conversion/conversion_test.go

@@ -304,3 +304,91 @@ func TestParseProviderData(t *testing.T) {
 		})
 	}
 }
+
+func TestParseEphemeralProviderData(t *testing.T) {
+	type args struct {
+		providerData any
+	}
+	type want struct {
+		ok           bool
+		providerData core.EphemeralProviderData
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    want
+		wantErr bool
+	}{
+		{
+			name: "provider has not been configured",
+			args: args{
+				providerData: nil,
+			},
+			want: want{
+				ok: false,
+			},
+			wantErr: false,
+		},
+		{
+			name: "invalid provider data",
+			args: args{
+				providerData: struct{}{},
+			},
+			want: want{
+				ok: false,
+			},
+			wantErr: true,
+		},
+		{
+			name: "valid provider data 1",
+			args: args{
+				providerData: core.EphemeralProviderData{},
+			},
+			want: want{
+				ok:           true,
+				providerData: core.EphemeralProviderData{},
+			},
+			wantErr: false,
+		},
+		{
+			name: "valid provider data 2",
+			args: args{
+				providerData: core.EphemeralProviderData{
+					PrivateKey:            "",
+					PrivateKeyPath:        "/home/dev/foo/private-key.json",
+					ServiceAccountKey:     "",
+					ServiceAccountKeyPath: "/home/dev/foo/key.json",
+					TokenCustomEndpoint:   "",
+				},
+			},
+			want: want{
+				ok: true,
+				providerData: core.EphemeralProviderData{
+					PrivateKey:            "",
+					PrivateKeyPath:        "/home/dev/foo/private-key.json",
+					ServiceAccountKey:     "",
+					ServiceAccountKeyPath: "/home/dev/foo/key.json",
+					TokenCustomEndpoint:   "",
+				},
+			},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx := context.Background()
+			diags := diag.Diagnostics{}
+
+			actual, ok := ParseEphemeralProviderData(ctx, tt.args.providerData, &diags)
+			if diags.HasError() != tt.wantErr {
+				t.Errorf("ConfigureClient() error = %v, want %v", diags.HasError(), tt.wantErr)
+			}
+			if ok != tt.want.ok {
+				t.Errorf("ParseProviderData() got = %v, want %v", ok, tt.want.ok)
+			}
+			if !reflect.DeepEqual(actual, tt.want.providerData) {
+				t.Errorf("ParseProviderData() got = %v, want %v", actual, tt.want)
+			}
+		})
+	}
+}

stackit/internal/core/core.go

@@ -26,8 +26,6 @@ const (
 )
 
 type EphemeralProviderData struct {
-	ProviderData
-
 	PrivateKey            string
 	PrivateKeyPath        string
 	ServiceAccountKey     string
@@ -38,7 +36,6 @@ type EphemeralProviderData struct {
 type ProviderData struct {
 	RoundTripper        http.RoundTripper
 	ServiceAccountEmail string // Deprecated: ServiceAccountEmail is not required and will be removed after 12th June 2025.
-
 	// Deprecated: Use DefaultRegion instead
 	Region                          string
 	DefaultRegion                   string

stackit/internal/services/access_token/ephemeral_resource.go

@@ -24,11 +24,7 @@ func NewAccessTokenEphemeralResource() ephemeral.EphemeralResource {
 }
 
 type accessTokenEphemeralResource struct {
-	serviceAccountKeyPath string
-	serviceAccountKey     string
-	privateKeyPath        string
-	privateKey            string
-	tokenCustomEndpoint   string
+	keyAuthConfig config.Configuration
 }
 
 func (e *accessTokenEphemeralResource) Configure(ctx context.Context, req ephemeral.ConfigureRequest, resp *ephemeral.ConfigureResponse) {
@@ -37,11 +33,13 @@ func (e *accessTokenEphemeralResource) Configure(ctx context.Context, req epheme
 		return
 	}
 
-	e.serviceAccountKey = providerData.ServiceAccountKey
-	e.serviceAccountKeyPath = providerData.ServiceAccountKeyPath
-	e.privateKey = providerData.PrivateKey
-	e.privateKeyPath = providerData.PrivateKeyPath
-	e.tokenCustomEndpoint = providerData.TokenCustomEndpoint
+	e.keyAuthConfig = config.Configuration{
+		ServiceAccountKey:     providerData.ServiceAccountKey,
+		ServiceAccountKeyPath: providerData.ServiceAccountKeyPath,
+		PrivateKeyPath:        providerData.PrivateKey,
+		PrivateKey:            providerData.PrivateKeyPath,
+		TokenCustomUrl:        providerData.TokenCustomEndpoint,
+	}
 }
 
 type ephemeralTokenModel struct {
@@ -54,7 +52,11 @@ func (e *accessTokenEphemeralResource) Metadata(_ context.Context, req ephemeral
 
 func (e *accessTokenEphemeralResource) Schema(_ context.Context, _ ephemeral.SchemaRequest, resp *ephemeral.SchemaResponse) {
 	resp.Schema = schema.Schema{
-		Description: "STACKIT Access Token ephemeral resource schema.",
+		Description: "Ephemeral resource that generates a short-lived STACKIT access token (JWT) using a service account key. " +
+			"A new token is generated each time the resource is evaluated, and it remains consistent for the duration of a Terraform operation. " +
+			"If a private key is not explicitly provided, the provider attempts to extract it from the service account key instead. " +
+			"Token generation logic prioritizes environment variables first, followed by provider configuration. " +
+			"Access tokens generated from service account keys expire after 60 minutes.",
 		Attributes: map[string]schema.Attribute{
 			"access_token": schema.StringAttribute{
 				Description: "JWT access token for STACKIT API authentication.",
@@ -73,15 +75,7 @@ func (e *accessTokenEphemeralResource) Open(ctx context.Context, req ephemeral.O
 		return
 	}
 
-	cfg := config.Configuration{
-		ServiceAccountKey:     e.serviceAccountKey,
-		ServiceAccountKeyPath: e.serviceAccountKeyPath,
-		PrivateKeyPath:        e.privateKeyPath,
-		PrivateKey:            e.privateKey,
-		TokenCustomUrl:        e.tokenCustomEndpoint,
-	}
-
-	rt, err := auth.KeyAuth(&cfg)
+	rt, err := auth.KeyAuth(&e.keyAuthConfig)
 	if err != nil {
 		core.LogAndAddError(ctx, &resp.Diagnostics, "Access token generation failed", fmt.Sprintf("Failed to initialize authentication: %v", err))
 		return
@@ -97,12 +91,7 @@ func (e *accessTokenEphemeralResource) Open(ctx context.Context, req ephemeral.O
 	// Retrieve the access token
 	accessToken, err := client.GetAccessToken()
 	if err != nil {
-		core.LogAndAddError(
-			ctx,
-			&resp.Diagnostics,
-			"Access token retrieval failed",
-			fmt.Sprintf("Error obtaining access token: %v", err),
-		)
+		core.LogAndAddError(ctx, &resp.Diagnostics, "Access token retrieval failed", fmt.Sprintf("Error obtaining access token: %v", err))
 		return
 	}