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

fix(deps): update module github.com/stackitcloud/stackit-sdk-go/services/ske to v0.21.1 (#643)

Browse source 
Co-authored-by: Renovate Bot <renovate@whitesourcesoftware.com>
This commit is contained in:
stackit-pipeline 2025-01-23 16:02:18 +01:00 • committed by GitHub
parent c8d21878ef
commit 4106cf2170
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 58 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

16
stackit/internal/services/ske/kubeconfig/resource.go
View file

@ -370,7 +370,7 @@ func mapFields(kubeconfigResp *ske.Kubeconfig, model *Model, creationTime time.T
}
model.Kubeconfig = types.StringPointerValue(kubeconfigResp.Kubeconfig)
model.ExpiresAt = types.StringPointerValue(kubeconfigResp.ExpirationTimestamp)
model.ExpiresAt = types.StringValue(kubeconfigResp.ExpirationTimestamp.Format(time.RFC3339))
// set creation time
model.CreationTime = types.StringValue(creationTime.Format(time.RFC3339))
return nil
@ -413,12 +413,7 @@ func checkCredentialsRotation(cluster *ske.Cluster, model *Model) (bool, error)
return false, fmt.Errorf("converting creationTime field to timestamp: %w", err)
}
if cluster.Status.CredentialsRotation.LastCompletionTime != nil {
lastCompletionTime, err := time.Parse(time.RFC3339, *cluster.Status.CredentialsRotation.LastCompletionTime)
if err != nil {
return false, fmt.Errorf("converting LastCompletionTime to timestamp: %w", err)
}
if creationTime.Before(lastCompletionTime) {
if creationTime.Before(*cluster.Status.CredentialsRotation.LastCompletionTime) {
return true, nil
}
}
@ -432,12 +427,7 @@ func checkClusterRecreation(cluster *ske.Cluster, model *Model) (bool, error) {
return false, fmt.Errorf("converting creationTime field to timestamp: %w", err)
}
if cluster.Status.CreationTime != nil {
clusterCreationTime, err := time.Parse(time.RFC3339, *cluster.Status.CreationTime)
if err != nil {
return false, fmt.Errorf("converting clusterCreationTime to timestamp: %w", err)
}
if creationTime.Before(clusterCreationTime) {
if creationTime.Before(*cluster.Status.CreationTime) {
return true, nil
}
}

42
stackit/internal/services/ske/kubeconfig/resource_test.go
View file

@ -21,7 +21,7 @@ func TestMapFields(t *testing.T) {
{
"simple_values",
&ske.Kubeconfig{
ExpirationTimestamp: utils.Ptr("2024-02-07T16:42:12Z"),
ExpirationTimestamp: utils.Ptr(time.Date(2024, 2, 7, 16, 42, 12, 0, time.UTC)),
Kubeconfig: utils.Ptr("kubeconfig"),
},
Model{
@ -50,7 +50,7 @@ func TestMapFields(t *testing.T) {
{
"no_kubeconfig_field",
&ske.Kubeconfig{
ExpirationTimestamp: utils.Ptr("2024-02-07T16:42:12Z"),
ExpirationTimestamp: utils.Ptr(time.Date(2024, 2, 7, 16, 42, 12, 0, time.UTC)),
},
Model{},
false,
@ -62,7 +62,7 @@ func TestMapFields(t *testing.T) {
ProjectId: tt.expected.ProjectId,
ClusterName: tt.expected.ClusterName,
}
creationTime, _ := time.Parse("2006-01-02T15:04:05Z07:00", tt.expected.CreationTime.ValueString())
creationTime, _ := time.Parse(time.RFC3339, tt.expected.CreationTime.ValueString())
err := mapFields(tt.input, state, creationTime)
if !tt.isValid && err == nil {
t.Fatalf("Should have failed")
@ -205,7 +205,7 @@ func TestCheckCredentialsRotation(t *testing.T) {
inputCluster: &ske.Cluster{
Status: &ske.ClusterStatus{
CredentialsRotation: &ske.CredentialsRotationState{
LastCompletionTime: utils.Ptr(time.Now().Add(-1 * time.Hour).Format(time.RFC3339)), // one hour ago
LastCompletionTime: utils.Ptr(time.Now().Add(-1 * time.Hour)), // one hour ago
},
},
},
@ -220,7 +220,7 @@ func TestCheckCredentialsRotation(t *testing.T) {
inputCluster: &ske.Cluster{
Status: &ske.ClusterStatus{
CredentialsRotation: &ske.CredentialsRotationState{
LastCompletionTime: utils.Ptr(time.Now().Add(1 * time.Hour).Format(time.RFC3339)),
LastCompletionTime: utils.Ptr(time.Now().Add(1 * time.Hour)),
},
},
},
@ -245,21 +245,6 @@ func TestCheckCredentialsRotation(t *testing.T) {
expected: false,
expectedError: false,
},
{
description: "invalid last completion time",
inputCluster: &ske.Cluster{
Status: &ske.ClusterStatus{
CredentialsRotation: &ske.CredentialsRotationState{
LastCompletionTime: utils.Ptr("invalid time"),
},
},
},
inputModel: &Model{
CreationTime: types.StringValue(time.Now().Format(time.RFC3339)),
},
expected: false,
expectedError: true,
},
}
for _, tt := range tests {
t.Run(tt.description, func(t *testing.T) {
@ -287,7 +272,7 @@ func TestCheckClusterRecreation(t *testing.T) {
description: "cluster creation time after kubeconfig creation time",
inputCluster: &ske.Cluster{
Status: &ske.ClusterStatus{
CreationTime: utils.Ptr(time.Now().Add(-1 * time.Hour).Format(time.RFC3339)),
CreationTime: utils.Ptr(time.Now().Add(-1 * time.Hour)),
},
},
inputModel: &Model{
@ -300,7 +285,7 @@ func TestCheckClusterRecreation(t *testing.T) {
description: "cluster creation time before kubeconfig creation time",
inputCluster: &ske.Cluster{
Status: &ske.ClusterStatus{
CreationTime: utils.Ptr(time.Now().Add(1 * time.Hour).Format(time.RFC3339)),
CreationTime: utils.Ptr(time.Now().Add(1 * time.Hour)),
},
},
inputModel: &Model{
@ -322,19 +307,6 @@ func TestCheckClusterRecreation(t *testing.T) {
expected: false,
expectedError: false,
},
{
description: "invalid cluster creation time",
inputCluster: &ske.Cluster{
Status: &ske.ClusterStatus{
CreationTime: utils.Ptr("invalid time"),
},
},
inputModel: &Model{
CreationTime: types.StringValue(time.Now().Format(time.RFC3339)),
},
expected: false,
expectedError: true,
},
}
for _, tt := range tests {
t.Run(tt.description, func(t *testing.T) {