Skip to content

chore(secretsmanager): switch to new SDK structure #1390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rubenhoenle merged 2 commits into from
Apr 20, 2026
Merged

chore(secretsmanager): switch to new SDK structure #1390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77c4e34
chore(secretsmanager): use new multi API version support SDK
GokceGK Apr 20, 2026
5a528d3
Merge branch 'main' into secrets-manager-sdk-update
GokceGK Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ require (
github.com/stackitcloud/stackit-sdk-go/services/redis v0.28.1
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.20.0
github.com/stackitcloud/stackit-sdk-go/services/scf v0.7.0
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.14.3
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.17.0
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.8
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.0
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,8 @@ github.com/stackitcloud/stackit-sdk-go/services/scf v0.7.0 h1:ip9BODkeeDXB5Y2i5p
github.com/stackitcloud/stackit-sdk-go/services/scf v0.7.0/go.mod h1:JuJbNkydnm1OFGiRweiLyOUqR6prSOveJC14b1oG+Ok=
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.14.3 h1:3hZSg3z+4AXa5LbR2Vl38VmSA83ABItE63E53LuyWv8=
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.14.3/go.mod h1:5unx5r0IgeFCtJDEgsWddtgKvYSw442FDNdhtfyJnQI=
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.17.0 h1:6gDKTxdPzabtJ4cPzNgCgsT2+z8v80DSCx476HqzaXk=
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.17.0/go.mod h1:vSWUMTsMbtniEo1I+eCsjCOTODR4iproNAeqG3vr/4I=
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.8 h1:LLyANBzE8sQa0/49tQBqq4sVLhNgwdqCeQm76srJHWw=
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.8/go.mod h1:/bmg57XZu+bGczzcoumrukiGMPGzI2mOyTT4BVIQUBs=
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.0 h1:4MYNb3VQjVnVPfJ9xhDbSQgoSkxQZJ0tsv9N7O43/RI=
Expand Down
6 changes: 3 additions & 3 deletions stackit/internal/services/secretsmanager/instance/datasource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"

"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/stackitcloud/stackit-sdk-go/services/secretsmanager"
secretsmanager "github.com/stackitcloud/stackit-sdk-go/services/secretsmanager/v1api"
)

// Ensure the implementation satisfies the expected interfaces.
Expand Down Expand Up @@ -146,7 +146,7 @@ func (r *instanceDataSource) Read(ctx context.Context, req datasource.ReadReques
ctx = tflog.SetField(ctx, "project_id", projectId)
ctx = tflog.SetField(ctx, "instance_id", instanceId)

instanceResp, err := r.client.GetInstance(ctx, projectId, instanceId).Execute()
instanceResp, err := r.client.DefaultAPI.GetInstance(ctx, projectId, instanceId).Execute()
if err != nil {
utils.LogError(
ctx,
Expand All @@ -164,7 +164,7 @@ func (r *instanceDataSource) Read(ctx context.Context, req datasource.ReadReques

ctx = core.LogResponse(ctx)

aclList, err := r.client.ListACLs(ctx, projectId, instanceId).Execute()
aclList, err := r.client.DefaultAPI.ListACLs(ctx, projectId, instanceId).Execute()
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading instance", fmt.Sprintf("Calling API for ACLs data: %v", err))
return
Expand Down
76 changes: 38 additions & 38 deletions stackit/internal/services/secretsmanager/instance/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
"github.com/stackitcloud/stackit-sdk-go/services/secretsmanager"
secretsmanager "github.com/stackitcloud/stackit-sdk-go/services/secretsmanager/v1api"
)

// Ensure the implementation satisfies the expected interfaces.
Expand Down Expand Up @@ -204,19 +204,19 @@ func (r *instanceResource) Create(ctx context.Context, req resource.CreateReques
return
}
// Create new instance
createResp, err := r.client.CreateInstance(ctx, projectId).CreateInstancePayload(*payload).Execute()
createResp, err := r.client.DefaultAPI.CreateInstance(ctx, projectId).CreateInstancePayload(*payload).Execute()
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating instance", fmt.Sprintf("Calling API: %v", err))
return
}

ctx = core.LogResponse(ctx)

if createResp.Id == nil {
if createResp.Id == "" {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating instance", "Got empty instance id")
return
}
instanceId := *createResp.Id
instanceId := createResp.Id
ctx = utils.SetAndLogStateFields(ctx, &resp.Diagnostics, &resp.State, map[string]any{
"project_id": projectId,
"instance_id": instanceId,
Expand All @@ -228,7 +228,7 @@ func (r *instanceResource) Create(ctx context.Context, req resource.CreateReques
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating instance", fmt.Sprintf("Creating ACLs: %v", err))
return
}
aclList, err := r.client.ListACLs(ctx, projectId, instanceId).Execute()
aclList, err := r.client.DefaultAPI.ListACLs(ctx, projectId, instanceId).Execute()
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating instance", fmt.Sprintf("Calling API for ACLs data: %v", err))
return
Expand Down Expand Up @@ -266,7 +266,7 @@ func (r *instanceResource) Read(ctx context.Context, req resource.ReadRequest, r
ctx = tflog.SetField(ctx, "project_id", projectId)
ctx = tflog.SetField(ctx, "instance_id", instanceId)

instanceResp, err := r.client.GetInstance(ctx, projectId, instanceId).Execute()
instanceResp, err := r.client.DefaultAPI.GetInstance(ctx, projectId, instanceId).Execute()
if err != nil {
oapiErr, ok := err.(*oapierror.GenericOpenAPIError) //nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped
if ok && oapiErr.StatusCode == http.StatusNotFound {
Expand All @@ -279,7 +279,7 @@ func (r *instanceResource) Read(ctx context.Context, req resource.ReadRequest, r

ctx = core.LogResponse(ctx)

aclList, err := r.client.ListACLs(ctx, projectId, instanceId).Execute()
aclList, err := r.client.DefaultAPI.ListACLs(ctx, projectId, instanceId).Execute()
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading instance", fmt.Sprintf("Calling API for ACLs data: %v", err))
return
Expand Down Expand Up @@ -324,7 +324,7 @@ func (r *instanceResource) Update(ctx context.Context, req resource.UpdateReques
return
}
// Update instance
err = r.client.UpdateInstance(ctx, projectId, instanceId).UpdateInstancePayload(*payload).Execute()
err = r.client.DefaultAPI.UpdateInstance(ctx, projectId, instanceId).UpdateInstancePayload(*payload).Execute()
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating instance", fmt.Sprintf("Calling API: %v", err))
return
Expand All @@ -348,15 +348,15 @@ func (r *instanceResource) Update(ctx context.Context, req resource.UpdateReques
return
}

instanceResp, err := r.client.GetInstance(ctx, projectId, instanceId).Execute()
instanceResp, err := r.client.DefaultAPI.GetInstance(ctx, projectId, instanceId).Execute()
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating instance acl", fmt.Sprintf("Calling API: %v", err))
return
}

ctx = core.LogResponse(ctx)

aclList, err := r.client.ListACLs(ctx, projectId, instanceId).Execute()
aclList, err := r.client.DefaultAPI.ListACLs(ctx, projectId, instanceId).Execute()
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating instance", fmt.Sprintf("Calling API for ACLs data: %v", err))
return
Expand Down Expand Up @@ -395,7 +395,7 @@ func (r *instanceResource) Delete(ctx context.Context, req resource.DeleteReques
ctx = tflog.SetField(ctx, "instance_id", instanceId)

// Delete existing instance
err := r.client.DeleteInstance(ctx, projectId, instanceId).Execute()
err := r.client.DefaultAPI.DeleteInstance(ctx, projectId, instanceId).Execute()
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting instance", fmt.Sprintf("Calling API: %v", err))
return
Expand Down Expand Up @@ -436,22 +436,22 @@ func mapFields(instance *secretsmanager.Instance, aclList *secretsmanager.ListAC
var instanceId string
if model.InstanceId.ValueString() != "" {
instanceId = model.InstanceId.ValueString()
} else if instance.Id != nil {
instanceId = *instance.Id
} else if instance.Id != "" {
instanceId = instance.Id
} else {
return fmt.Errorf("instance id not present")
}

model.Id = utils.BuildInternalTerraformId(model.ProjectId.ValueString(), instanceId)
model.InstanceId = types.StringValue(instanceId)
model.Name = types.StringPointerValue(instance.Name)
model.Name = types.StringValue(instance.Name)

if instance.KmsKey != nil {
model.KmsKey = &KmsKeyModel{
KeyId: types.StringPointerValue(instance.KmsKey.KeyId),
KeyRingId: types.StringPointerValue(instance.KmsKey.KeyRingId),
KeyVersion: types.Int64PointerValue(instance.KmsKey.KeyVersion),
ServiceAccountEmail: types.StringPointerValue(instance.KmsKey.ServiceAccountEmail),
KeyId: types.StringValue(instance.KmsKey.KeyId),
KeyRingId: types.StringValue(instance.KmsKey.KeyRingId),
KeyVersion: types.Int64Value(instance.KmsKey.KeyVersion),
ServiceAccountEmail: types.StringValue(instance.KmsKey.ServiceAccountEmail),
}
}

Expand All @@ -467,14 +467,14 @@ func mapACLs(aclList *secretsmanager.ListACLsResponse, model *Model) error {
if aclList == nil {
return fmt.Errorf("nil ACL list")
}
if aclList.Acls == nil || len(*aclList.Acls) == 0 {
if len(aclList.Acls) == 0 {
model.ACLs = types.SetNull(types.StringType)
return nil
}

acls := []attr.Value{}
for _, acl := range *aclList.Acls {
acls = append(acls, types.StringValue(*acl.Cidr))
for _, acl := range aclList.Acls {
acls = append(acls, types.StringValue(acl.Cidr))
}
aclsList, diags := types.SetValue(types.StringType, acls)
if diags.HasError() {
Expand All @@ -489,15 +489,15 @@ func toCreatePayload(model *Model) (*secretsmanager.CreateInstancePayload, error
return nil, fmt.Errorf("nil model")
}
payload := &secretsmanager.CreateInstancePayload{
Name: conversion.StringValueToPointer(model.Name),
Name: model.Name.ValueString(),
}

if model.KmsKey != nil {
payload.KmsKey = &secretsmanager.KmsKeyPayload{
KeyId: conversion.StringValueToPointer(model.KmsKey.KeyId),
KeyRingId: conversion.StringValueToPointer(model.KmsKey.KeyRingId),
KeyVersion: conversion.Int64ValueToPointer(model.KmsKey.KeyVersion),
ServiceAccountEmail: conversion.StringValueToPointer(model.KmsKey.ServiceAccountEmail),
KeyId: model.KmsKey.KeyId.ValueString(),
KeyRingId: model.KmsKey.KeyRingId.ValueString(),
KeyVersion: model.KmsKey.KeyVersion.ValueInt64(),
ServiceAccountEmail: model.KmsKey.ServiceAccountEmail.ValueString(),
}
}

Expand All @@ -510,15 +510,15 @@ func toUpdatePayload(model *Model) (*secretsmanager.UpdateInstancePayload, error
}

payload := &secretsmanager.UpdateInstancePayload{
Name: conversion.StringValueToPointer(model.Name),
Name: model.Name.ValueString(),
}

if model.KmsKey != nil {
payload.KmsKey = &secretsmanager.KmsKeyPayload{
KeyId: conversion.StringValueToPointer(model.KmsKey.KeyId),
KeyRingId: conversion.StringValueToPointer(model.KmsKey.KeyRingId),
KeyVersion: conversion.Int64ValueToPointer(model.KmsKey.KeyVersion),
ServiceAccountEmail: conversion.StringValueToPointer(model.KmsKey.ServiceAccountEmail),
KeyId: model.KmsKey.KeyId.ValueString(),
KeyRingId: model.KmsKey.KeyRingId.ValueString(),
KeyVersion: model.KmsKey.KeyVersion.ValueInt64(),
ServiceAccountEmail: model.KmsKey.ServiceAccountEmail.ValueString(),
}
}

Expand All @@ -528,7 +528,7 @@ func toUpdatePayload(model *Model) (*secretsmanager.UpdateInstancePayload, error
// updateACLs creates and deletes ACLs so that the instance's ACLs are the ones in the model
func updateACLs(ctx context.Context, projectId, instanceId string, acls []string, client *secretsmanager.APIClient) error {
// Get ACLs current state
currentACLsResp, err := client.ListACLs(ctx, projectId, instanceId).Execute()
currentACLsResp, err := client.DefaultAPI.ListACLs(ctx, projectId, instanceId).Execute()
if err != nil {
return fmt.Errorf("fetching current ACLs: %w", err)
}
Expand All @@ -544,29 +544,29 @@ func updateACLs(ctx context.Context, projectId, instanceId string, acls []string
isInModel: true,
}
}
for _, acl := range *currentACLsResp.Acls {
cidr := *acl.Cidr
for _, acl := range currentACLsResp.Acls {
cidr := acl.Cidr
if _, ok := aclsState[cidr]; !ok {
aclsState[cidr] = &aclState{}
}
aclsState[cidr].isCreated = true
aclsState[cidr].id = *acl.Id
aclsState[cidr].id = acl.Id
}

// Create/delete ACLs
for cidr, state := range aclsState {
if state.isInModel && !state.isCreated {
payload := secretsmanager.CreateACLPayload{
Cidr: new(cidr),
Cidr: cidr,
}
_, err := client.CreateACL(ctx, projectId, instanceId).CreateACLPayload(payload).Execute()
_, err := client.DefaultAPI.CreateACL(ctx, projectId, instanceId).CreateACLPayload(payload).Execute()
if err != nil {
return fmt.Errorf("creating ACL '%v': %w", cidr, err)
}
}

if !state.isInModel && state.isCreated {
err := client.DeleteACL(ctx, projectId, instanceId, state.id).Execute()
err := client.DefaultAPI.DeleteACL(ctx, projectId, instanceId, state.id).Execute()
if err != nil {
return fmt.Errorf("deleting ACL '%v': %w", cidr, err)
}
Expand Down
Loading
Loading