Skip to content

chore(rabbitmq): switch to new SDK structure #1374

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
GokceGK merged 5 commits into from
Apr 14, 2026
Merged

chore(rabbitmq): switch to new SDK structure #1374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c33859
chore(rabbitmq): use new multi API version support SDK
GokceGK Apr 14, 2026
4d74c6a
remove tls from instance parameters
GokceGK Apr 14, 2026
11baed0
Revert "remove tls from instance parameters"
GokceGK Apr 14, 2026
25184ea
Merge branch 'main' into rabbitmq-sdk-update
GokceGK Apr 14, 2026
61a18d5
Merge branch 'main' into rabbitmq-sdk-update
GokceGK Apr 14, 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 @@ -30,7 +30,7 @@ require (
github.com/stackitcloud/stackit-sdk-go/services/observability v0.17.0
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.26.1
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.5
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.26.0
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.29.0
github.com/stackitcloud/stackit-sdk-go/services/redis v0.27.3
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.20.0
github.com/stackitcloud/stackit-sdk-go/services/scf v0.6.1
Expand Down
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,10 @@ github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.5 h1:H67e3KnHQ
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.5/go.mod h1:xmAWk9eom8wznvLuLfm0F4xyeiBX8LaggXsKFmos+dw=
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.26.0 h1:/8lmviszgrB+0Cz7HdhFELyTiTeqIs7LfnI6sNX4rW8=
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.26.0/go.mod h1:hnhvlLX1Y71R8KIQqLBeoSZqkU5ZJOG0J4wz0LeUdaw=
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.29.0 h1:I8NF8Q5nRj7/7qDI8Qm4oI0KCNQcOjE6kqyBdWcUoxk=
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.29.0/go.mod h1:wk2Oz+7pxT9YF1h6elWzdlhU6V7GSQXcGixxlXxNe+U=
github.com/stackitcloud/stackit-sdk-go/services/redis v0.25.6 h1:CXM9cZ9WeTyJd+Aw/hnJnDsKRVAQi4qgtd0RJ3zoPwo=
github.com/stackitcloud/stackit-sdk-go/services/redis v0.25.6/go.mod h1:KJNceOHRefjku1oVBoHG7idCS/SeW42WJ+55bN3AxrQ=
github.com/stackitcloud/stackit-sdk-go/services/redis v0.27.3 h1:wZIGETPQ1aiJwzJMVjatdu/Kv+/yuKVOf5RaMWW9bpU=
github.com/stackitcloud/stackit-sdk-go/services/redis v0.27.3/go.mod h1:jgWx29zvZP0R3tXAC/qWU5eBsPfLBJFP96mx9hwdFPM=
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.20.0 h1:bT/qoghsdKvLomCay9Wj4Fu63lx0cD2zr23Fjqzgotc=
Expand Down
6 changes: 3 additions & 3 deletions stackit/internal/services/rabbitmq/credential/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/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/stackitcloud/stackit-sdk-go/services/rabbitmq"
rabbitmq "github.com/stackitcloud/stackit-sdk-go/services/rabbitmq/v1api"
)

// Ensure the implementation satisfies the expected interfaces.
Expand Down Expand Up @@ -118,7 +118,7 @@ func (r *credentialDataSource) Schema(_ context.Context, _ datasource.SchemaRequ
Computed: true,
Sensitive: true,
},
"port": schema.Int64Attribute{
"port": schema.Int32Attribute{
Computed: true,
},
"uri": schema.StringAttribute{
Expand Down Expand Up @@ -154,7 +154,7 @@ func (r *credentialDataSource) Read(ctx context.Context, req datasource.ReadRequ
ctx = tflog.SetField(ctx, "instance_id", instanceId)
ctx = tflog.SetField(ctx, "credential_id", credentialId)

recordSetResp, err := r.client.GetCredentials(ctx, projectId, instanceId, credentialId).Execute()
recordSetResp, err := r.client.DefaultAPI.GetCredentials(ctx, projectId, instanceId, credentialId).Execute()
if err != nil {
utils.LogError(
ctx,
Expand Down
91 changes: 45 additions & 46 deletions stackit/internal/services/rabbitmq/credential/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ 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/rabbitmq"
"github.com/stackitcloud/stackit-sdk-go/services/rabbitmq/wait"
rabbitmq "github.com/stackitcloud/stackit-sdk-go/services/rabbitmq/v1api"
"github.com/stackitcloud/stackit-sdk-go/services/rabbitmq/v1api/wait"
)

// Ensure the implementation satisfies the expected interfaces.
Expand All @@ -44,7 +44,7 @@ type Model struct {
HttpAPIURIs types.List `tfsdk:"http_api_uris"`
Management types.String `tfsdk:"management"`
Password types.String `tfsdk:"password"`
Port types.Int64 `tfsdk:"port"`
Port types.Int32 `tfsdk:"port"`
Uri types.String `tfsdk:"uri"`
Uris types.List `tfsdk:"uris"`
Username types.String `tfsdk:"username"`
Expand Down Expand Up @@ -156,7 +156,7 @@ func (r *credentialResource) Schema(_ context.Context, _ resource.SchemaRequest,
Computed: true,
Sensitive: true,
},
"port": schema.Int64Attribute{
"port": schema.Int32Attribute{
Computed: true,
},
"uri": schema.StringAttribute{
Expand Down Expand Up @@ -191,19 +191,19 @@ func (r *credentialResource) Create(ctx context.Context, req resource.CreateRequ
ctx = tflog.SetField(ctx, "instance_id", instanceId)

// Create new recordset
credentialsResp, err := r.client.CreateCredentials(ctx, projectId, instanceId).Execute()
credentialsResp, err := r.client.DefaultAPI.CreateCredentials(ctx, projectId, instanceId).Execute()
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating credential", fmt.Sprintf("Calling API: %v", err))
return
}

ctx = core.LogResponse(ctx)

if credentialsResp.Id == nil {
if credentialsResp.Id == "" {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating credential", "Got empty credential id")
return
}
credentialId := *credentialsResp.Id
credentialId := credentialsResp.Id
ctx = utils.SetAndLogStateFields(ctx, &resp.Diagnostics, &resp.State, map[string]any{
"project_id": projectId,
"instance_id": instanceId,
Expand All @@ -213,7 +213,7 @@ func (r *credentialResource) Create(ctx context.Context, req resource.CreateRequ
return
}

waitResp, err := wait.CreateCredentialsWaitHandler(ctx, r.client, projectId, instanceId, credentialId).WaitWithContext(ctx)
waitResp, err := wait.CreateCredentialsWaitHandler(ctx, r.client.DefaultAPI, projectId, instanceId, credentialId).WaitWithContext(ctx)
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating credential", fmt.Sprintf("Instance creation waiting: %v", err))
return
Expand Down Expand Up @@ -251,7 +251,7 @@ func (r *credentialResource) Read(ctx context.Context, req resource.ReadRequest,
ctx = tflog.SetField(ctx, "instance_id", instanceId)
ctx = tflog.SetField(ctx, "credential_id", credentialId)

recordSetResp, err := r.client.GetCredentials(ctx, projectId, instanceId, credentialId).Execute()
recordSetResp, err := r.client.DefaultAPI.GetCredentials(ctx, projectId, instanceId, credentialId).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 Down Expand Up @@ -305,14 +305,14 @@ func (r *credentialResource) Delete(ctx context.Context, req resource.DeleteRequ
ctx = tflog.SetField(ctx, "credential_id", credentialId)

// Delete existing record set
err := r.client.DeleteCredentials(ctx, projectId, instanceId, credentialId).Execute()
err := r.client.DefaultAPI.DeleteCredentials(ctx, projectId, instanceId, credentialId).Execute()
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting credential", fmt.Sprintf("Calling API: %v", err))
}

ctx = core.LogResponse(ctx)

_, err = wait.DeleteCredentialsWaitHandler(ctx, r.client, projectId, instanceId, credentialId).WaitWithContext(ctx)
_, err = wait.DeleteCredentialsWaitHandler(ctx, r.client.DefaultAPI, projectId, instanceId, credentialId).WaitWithContext(ctx)
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting credential", fmt.Sprintf("Instance deletion waiting: %v", err))
return
Expand Down Expand Up @@ -358,8 +358,8 @@ func mapFields(ctx context.Context, credentialsResp *rabbitmq.CredentialsRespons
var credentialId string
if model.CredentialId.ValueString() != "" {
credentialId = model.CredentialId.ValueString()
} else if credentialsResp.Id != nil {
credentialId = *credentialsResp.Id
} else if credentialsResp.Id != "" {
credentialId = credentialsResp.Id
} else {
return fmt.Errorf("credentials id not present")
}
Expand All @@ -385,51 +385,50 @@ func mapFields(ctx context.Context, credentialsResp *rabbitmq.CredentialsRespons
model.Hosts = types.ListNull(types.StringType)
model.Uris = types.ListNull(types.StringType)
model.HttpAPIURIs = types.ListNull(types.StringType)
if credentials != nil {
if credentials.Hosts != nil {
respHosts := *credentials.Hosts
reconciledHosts := utils.ReconcileStringSlices(modelHosts, respHosts)
if credentials.Hosts != nil {
respHosts := credentials.Hosts
reconciledHosts := utils.ReconcileStringSlices(modelHosts, respHosts)

hostsTF, diags := types.ListValueFrom(ctx, types.StringType, reconciledHosts)
if diags.HasError() {
return fmt.Errorf("failed to map hosts: %w", core.DiagsToError(diags))
}

model.Hosts = hostsTF
hostsTF, diags := types.ListValueFrom(ctx, types.StringType, reconciledHosts)
if diags.HasError() {
return fmt.Errorf("failed to map hosts: %w", core.DiagsToError(diags))
}
model.Host = types.StringPointerValue(credentials.Host)
if credentials.HttpApiUris != nil {
respHttpApiUris := *credentials.HttpApiUris

reconciledHttpApiUris := utils.ReconcileStringSlices(modelHttpApiUris, respHttpApiUris)
model.Hosts = hostsTF
}
model.Host = types.StringValue(credentials.Host)
if credentials.HttpApiUris != nil {
respHttpApiUris := credentials.HttpApiUris

httpApiUrisTF, diags := types.ListValueFrom(ctx, types.StringType, reconciledHttpApiUris)
if diags.HasError() {
return fmt.Errorf("failed to map httpApiUris: %w", core.DiagsToError(diags))
}
reconciledHttpApiUris := utils.ReconcileStringSlices(modelHttpApiUris, respHttpApiUris)

model.HttpAPIURIs = httpApiUrisTF
httpApiUrisTF, diags := types.ListValueFrom(ctx, types.StringType, reconciledHttpApiUris)
if diags.HasError() {
return fmt.Errorf("failed to map httpApiUris: %w", core.DiagsToError(diags))
}

if credentials.Uris != nil {
respUris := *credentials.Uris
model.HttpAPIURIs = httpApiUrisTF
}

reconciledUris := utils.ReconcileStringSlices(modelUris, respUris)
if credentials.Uris != nil {
respUris := credentials.Uris

urisTF, diags := types.ListValueFrom(ctx, types.StringType, reconciledUris)
if diags.HasError() {
return fmt.Errorf("failed to map uris: %w", core.DiagsToError(diags))
}
reconciledUris := utils.ReconcileStringSlices(modelUris, respUris)

model.Uris = urisTF
urisTF, diags := types.ListValueFrom(ctx, types.StringType, reconciledUris)
if diags.HasError() {
return fmt.Errorf("failed to map uris: %w", core.DiagsToError(diags))
}

model.HttpAPIURI = types.StringPointerValue(credentials.HttpApiUri)
model.Management = types.StringPointerValue(credentials.Management)
model.Password = types.StringPointerValue(credentials.Password)
model.Port = types.Int64PointerValue(credentials.Port)
model.Uri = types.StringPointerValue(credentials.Uri)
model.Username = types.StringPointerValue(credentials.Username)
model.Uris = urisTF
}

model.HttpAPIURI = types.StringPointerValue(credentials.HttpApiUri)
model.Management = types.StringPointerValue(credentials.Management)
model.Password = types.StringValue(credentials.Password)
model.Port = types.Int32PointerValue(credentials.Port)
model.Uri = types.StringPointerValue(credentials.Uri)
model.Username = types.StringValue(credentials.Username)

return nil
}
Loading
Loading