stackit-dev-tools/terraform-provider-stackitprivatepreview
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix SKE enablement using Service Enablement API (#472)

Browse source 
* Replace ske wait with enablement wait in service enablement

* Move GetServiceStatus to the enablement api, ignore linting on GetCredential
This commit is contained in:
Diogo Ferrão 2024-07-18 14:28:13 +01:00 • committed by GitHub
parent b878289951
commit f762c4800b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 72 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
stackit/internal/services/ske/cluster/datasource.go
View file

@ -359,7 +359,7 @@ func (r *clusterDataSource) getCredential(ctx context.Context, diags *diag.Diagn
model.KubeConfig = types.StringPointerValue(nil) model.KubeConfig = types.StringPointerValue(nil)
return nil return nil
} }
res, err := c.GetCredentials(ctx, model.ProjectId.ValueString(), model.Name.ValueString()).Execute() res, err := c.GetCredentials(ctx, model.ProjectId.ValueString(), model.Name.ValueString()).Execute() //nolint:staticcheck //This endpoint is deprecated but is called to support a deprecated attribute, will be removed with the attribute
if err != nil { 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 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 { if !ok {

13
stackit/internal/services/ske/cluster/resource.go
View file

@ -31,8 +31,9 @@ import (
"github.com/stackitcloud/stackit-sdk-go/core/oapierror" "github.com/stackitcloud/stackit-sdk-go/core/oapierror"
sdkUtils "github.com/stackitcloud/stackit-sdk-go/core/utils" sdkUtils "github.com/stackitcloud/stackit-sdk-go/core/utils"
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement" "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
enablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/wait"
"github.com/stackitcloud/stackit-sdk-go/services/ske" "github.com/stackitcloud/stackit-sdk-go/services/ske"
"github.com/stackitcloud/stackit-sdk-go/services/ske/wait" skeWait "github.com/stackitcloud/stackit-sdk-go/services/ske/wait"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils"
@ -669,7 +670,7 @@ func (r *clusterResource) Create(ctx context.Context, req resource.CreateRequest
return return
} }
_, err = wait.EnableServiceWaitHandler(ctx, r.skeClient, projectId).WaitWithContext(ctx) _, err = enablementWait.EnableServiceWaitHandler(ctx, r.enablementClient, projectId, utils.SKEServiceId).WaitWithContext(ctx)
if err != nil { if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating cluster", fmt.Sprintf("Wait for SKE enablement: %v", err)) core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating cluster", fmt.Sprintf("Wait for SKE enablement: %v", err))
return return
@ -796,12 +797,12 @@ func (r *clusterResource) createOrUpdateCluster(ctx context.Context, diags *diag
return return
} }
waitResp, err := wait.CreateOrUpdateClusterWaitHandler(ctx, r.skeClient, projectId, name).WaitWithContext(ctx) waitResp, err := skeWait.CreateOrUpdateClusterWaitHandler(ctx, r.skeClient, projectId, name).WaitWithContext(ctx)
if err != nil { if err != nil {
core.LogAndAddError(ctx, diags, "Error creating/updating cluster", fmt.Sprintf("Cluster creation waiting: %v", err)) core.LogAndAddError(ctx, diags, "Error creating/updating cluster", fmt.Sprintf("Cluster creation waiting: %v", err))
return return
} }
if waitResp.Status.Error != nil && waitResp.Status.Error.Message != nil && *waitResp.Status.Error.Code == wait.InvalidArgusInstanceErrorCode { if waitResp.Status.Error != nil && waitResp.Status.Error.Message != nil && *waitResp.Status.Error.Code == skeWait.InvalidArgusInstanceErrorCode {
core.LogAndAddWarning(ctx, diags, "Warning during creating/updating cluster", fmt.Sprintf("Cluster is in Impaired state due to an invalid argus instance id, the cluster is usable but metrics won't be forwarded: %s", *waitResp.Status.Error.Message)) core.LogAndAddWarning(ctx, diags, "Warning during creating/updating cluster", fmt.Sprintf("Cluster is in Impaired state due to an invalid argus instance id, the cluster is usable but metrics won't be forwarded: %s", *waitResp.Status.Error.Message))
} }
@ -827,7 +828,7 @@ func (r *clusterResource) getCredential(ctx context.Context, diags *diag.Diagnos
model.KubeConfig = types.StringPointerValue(nil) model.KubeConfig = types.StringPointerValue(nil)
return nil return nil
} }
res, err := c.GetCredentials(ctx, model.ProjectId.ValueString(), model.Name.ValueString()).Execute() res, err := c.GetCredentials(ctx, model.ProjectId.ValueString(), model.Name.ValueString()).Execute() //nolint:staticcheck //This endpoint is deprecated but is called to support a deprecated attribute, will be removed with the attribute
if err != nil { 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 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 { if !ok {
@ -1950,7 +1951,7 @@ func (r *clusterResource) Delete(ctx context.Context, req resource.DeleteRequest
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting cluster", fmt.Sprintf("Calling API: %v", err)) core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting cluster", fmt.Sprintf("Calling API: %v", err))
return return
} }
_, err = wait.DeleteClusterWaitHandler(ctx, r.skeClient, projectId, name).WaitWithContext(ctx) _, err = skeWait.DeleteClusterWaitHandler(ctx, r.skeClient, projectId, name).WaitWithContext(ctx)
if err != nil { if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting cluster", fmt.Sprintf("Cluster deletion waiting: %v", err)) core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting cluster", fmt.Sprintf("Cluster deletion waiting: %v", err))
return return

28
stackit/internal/services/ske/project/datasource.go
View file

@ -10,8 +10,10 @@ import (
"github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types"
"github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflog"
"github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/config"
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
"github.com/stackitcloud/stackit-sdk-go/services/ske" "github.com/stackitcloud/stackit-sdk-go/services/ske"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
) )
@ -27,7 +29,8 @@ func NewProjectDataSource() datasource.DataSource {
// projectDataSource is the data source implementation. // projectDataSource is the data source implementation.
type projectDataSource struct { type projectDataSource struct {
client *ske.APIClient skeClient *ske.APIClient
enablementClient *serviceenablement.APIClient
} }
// Metadata returns the data source type name. // Metadata returns the data source type name.
@ -49,6 +52,7 @@ func (r *projectDataSource) Configure(ctx context.Context, req datasource.Config
} }
var apiClient *ske.APIClient var apiClient *ske.APIClient
var enablementClient *serviceenablement.APIClient
var err error var err error
if providerData.SKECustomEndpoint != "" { if providerData.SKECustomEndpoint != "" {
apiClient, err = ske.NewAPIClient( apiClient, err = ske.NewAPIClient(
@ -67,7 +71,25 @@ func (r *projectDataSource) Configure(ctx context.Context, req datasource.Config
return return
} }
r.client = apiClient if providerData.ServiceEnablementCustomEndpoint != "" {
enablementClient, err = serviceenablement.NewAPIClient(
config.WithCustomAuth(providerData.RoundTripper),
config.WithEndpoint(providerData.ServiceEnablementCustomEndpoint),
)
} else {
enablementClient, err = serviceenablement.NewAPIClient(
config.WithCustomAuth(providerData.RoundTripper),
config.WithRegion(providerData.Region),
)
}
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error configuring Service Enablement API client", fmt.Sprintf("Configuring client: %v. This is an error related to the provider configuration, not to the resource configuration", err))
return
}
r.skeClient = apiClient
r.enablementClient = enablementClient
tflog.Info(ctx, "SKE client configured") tflog.Info(ctx, "SKE client configured")
} }
@ -104,7 +126,7 @@ func (r *projectDataSource) Read(ctx context.Context, req datasource.ReadRequest
projectId := model.ProjectId.ValueString() projectId := model.ProjectId.ValueString()
ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "project_id", projectId)
_, err := r.client.GetServiceStatus(ctx, projectId).Execute() _, err := r.enablementClient.GetServiceStatus(ctx, projectId, utils.SKEServiceId).Execute()
if err != nil { if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading project", fmt.Sprintf("Calling API: %v", err)) core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading project", fmt.Sprintf("Calling API: %v", err))
return return

54
stackit/internal/services/ske/project/resource.go
View file

@ -14,9 +14,11 @@ import (
"github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types"
"github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflog"
"github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/config"
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
enablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/wait"
"github.com/stackitcloud/stackit-sdk-go/services/ske" "github.com/stackitcloud/stackit-sdk-go/services/ske"
"github.com/stackitcloud/stackit-sdk-go/services/ske/wait"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
) )
@ -39,7 +41,8 @@ func NewProjectResource() resource.Resource {
// projectResource is the resource implementation. // projectResource is the resource implementation.
type projectResource struct { type projectResource struct {
client *ske.APIClient skeClient *ske.APIClient
enablementClient *serviceenablement.APIClient
} }
// Metadata returns the resource type name. // Metadata returns the resource type name.
@ -61,6 +64,7 @@ func (r *projectResource) Configure(ctx context.Context, req resource.ConfigureR
} }
var apiClient *ske.APIClient var apiClient *ske.APIClient
var enablementClient *serviceenablement.APIClient
var err error var err error
if providerData.SKECustomEndpoint != "" { if providerData.SKECustomEndpoint != "" {
apiClient, err = ske.NewAPIClient( apiClient, err = ske.NewAPIClient(
@ -75,11 +79,29 @@ func (r *projectResource) Configure(ctx context.Context, req resource.ConfigureR
} }
if err != nil { if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error configuring API client", fmt.Sprintf("Configuring client: %v. This is an error related to the provider configuration, not to the resource configuration", err)) core.LogAndAddError(ctx, &resp.Diagnostics, "Error configuring SKE API client", fmt.Sprintf("Configuring client: %v. This is an error related to the provider configuration, not to the resource configuration", err))
return return
} }
r.client = apiClient if providerData.ServiceEnablementCustomEndpoint != "" {
enablementClient, err = serviceenablement.NewAPIClient(
config.WithCustomAuth(providerData.RoundTripper),
config.WithEndpoint(providerData.ServiceEnablementCustomEndpoint),
)
} else {
enablementClient, err = serviceenablement.NewAPIClient(
config.WithCustomAuth(providerData.RoundTripper),
config.WithRegion(providerData.Region),
)
}
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error configuring Service Enablement API client", fmt.Sprintf("Configuring client: %v. This is an error related to the provider configuration, not to the resource configuration", err))
return
}
r.skeClient = apiClient
r.enablementClient = enablementClient
tflog.Info(ctx, "SKE project client configured") tflog.Info(ctx, "SKE project client configured")
} }
@ -122,16 +144,17 @@ func (r *projectResource) Create(ctx context.Context, req resource.CreateRequest
return return
} }
projectId := model.ProjectId.ValueString() projectId := model.ProjectId.ValueString()
_, err := r.client.EnableService(ctx, projectId).Execute()
// If SKE functionality is not enabled, enable it
err := r.enablementClient.EnableService(ctx, projectId, utils.SKEServiceId).Execute()
if err != nil { if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating project", fmt.Sprintf("Calling API: %v", err)) core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating project", fmt.Sprintf("Calling API to enable SKE: %v", err))
return return
} }
model.Id = types.StringValue(projectId) _, err = enablementWait.EnableServiceWaitHandler(ctx, r.enablementClient, projectId, utils.SKEServiceId).WaitWithContext(ctx)
_, err = wait.EnableServiceWaitHandler(ctx, r.client, projectId).WaitWithContext(ctx)
if err != nil { if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating cluster", fmt.Sprintf("Project creation waiting: %v", err)) core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating project", fmt.Sprintf("Wait for SKE enablement: %v", err))
return return
} }
@ -152,7 +175,7 @@ func (r *projectResource) Read(ctx context.Context, req resource.ReadRequest, re
return return
} }
projectId := model.ProjectId.ValueString() projectId := model.ProjectId.ValueString()
_, err := r.client.GetServiceStatus(ctx, projectId).Execute() _, err := r.enablementClient.GetServiceStatus(ctx, projectId, utils.SKEServiceId).Execute()
if err != nil { if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading project", fmt.Sprintf("Calling API: %v", err)) core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading project", fmt.Sprintf("Calling API: %v", err))
return return
@ -183,7 +206,7 @@ func (r *projectResource) Delete(ctx context.Context, req resource.DeleteRequest
projectId := model.ProjectId.ValueString() projectId := model.ProjectId.ValueString()
ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "project_id", projectId)
c := r.client c := r.skeClient
clusters, err := c.ListClusters(ctx, projectId).Execute() clusters, err := c.ListClusters(ctx, projectId).Execute()
if err != nil { if err != nil {
@ -196,14 +219,15 @@ func (r *projectResource) Delete(ctx context.Context, req resource.DeleteRequest
return return
} }
_, err = c.DisableService(ctx, projectId).Execute() err = r.enablementClient.DisableService(ctx, projectId, utils.SKEServiceId).Execute()
if err != nil { if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting project", fmt.Sprintf("Calling API: %v", err)) core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting project", fmt.Sprintf("Calling API to disable SKE: %v", err))
return return
} }
_, err = wait.DisableServiceWaitHandler(ctx, r.client, projectId).WaitWithContext(ctx)
_, err = enablementWait.DisableServiceWaitHandler(ctx, r.enablementClient, projectId, utils.SKEServiceId).WaitWithContext(ctx)
if err != nil { if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting project", fmt.Sprintf("Project deletion waiting: %v", err)) core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting project", fmt.Sprintf("Wait for SKE disabling: %v", err))
return return
} }
tflog.Info(ctx, "SKE project deleted") tflog.Info(ctx, "SKE project deleted")