diff --git a/go.mod b/go.mod index 2c6ab533..9ed0d20f 100644 --- a/go.mod +++ b/go.mod @@ -12,8 +12,8 @@ require ( github.com/hashicorp/terraform-plugin-log v0.9.0 github.com/hashicorp/terraform-plugin-testing v1.8.0 github.com/stackitcloud/stackit-sdk-go/core v0.12.0 - github.com/stackitcloud/stackit-sdk-go/services/argus v0.10.0 - github.com/stackitcloud/stackit-sdk-go/services/dns v0.9.1 + github.com/stackitcloud/stackit-sdk-go/services/argus v0.11.0 + github.com/stackitcloud/stackit-sdk-go/services/dns v0.10.0 github.com/stackitcloud/stackit-sdk-go/services/iaas v0.3.0 github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.12.0 github.com/stackitcloud/stackit-sdk-go/services/logme v0.14.0 @@ -26,7 +26,7 @@ require ( github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.14.0 github.com/stackitcloud/stackit-sdk-go/services/redis v0.14.0 github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.8.0 - github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.7.0 + github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.8.0 github.com/stackitcloud/stackit-sdk-go/services/ske v0.15.0 golang.org/x/mod v0.17.0 ) diff --git a/go.sum b/go.sum index b6ce744f..c67839b4 100644 --- a/go.sum +++ b/go.sum @@ -146,10 +146,10 @@ github.com/skeema/knownhosts v1.2.2 h1:Iug2P4fLmDw9f41PB6thxUkNUkJzB5i+1/exaj40L github.com/skeema/knownhosts v1.2.2/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= github.com/stackitcloud/stackit-sdk-go/core v0.12.0 h1:auIzUUNRuydKOScvpICP4MifGgvOajiDQd+ncGmBL0U= github.com/stackitcloud/stackit-sdk-go/core v0.12.0/go.mod h1:mDX1mSTsB3mP+tNBGcFNx6gH1mGBN4T+dVt+lcw7nlw= -github.com/stackitcloud/stackit-sdk-go/services/argus v0.10.0 h1:FAYOt6UBy/F2jPH2C/NnZnbjLZryJBjtM3afLVgGc4w= -github.com/stackitcloud/stackit-sdk-go/services/argus v0.10.0/go.mod h1:nVllQfYODhX1q3bgwVTLO7wHOp+8NMLiKbn3u/Dg5nU= -github.com/stackitcloud/stackit-sdk-go/services/dns v0.9.1 h1:pj2nAJvgzFSckA56rCPdi7StXGrr06go8qejI1weNJ8= -github.com/stackitcloud/stackit-sdk-go/services/dns v0.9.1/go.mod h1:MdZcRbs19s2NLeJmSLSoqTzm9IPIQhE1ZEMpo9gePq0= +github.com/stackitcloud/stackit-sdk-go/services/argus v0.11.0 h1:JVEx/ouHB6PlwGzQa3ywyDym1HTWo3WgrxAyXprCnuM= +github.com/stackitcloud/stackit-sdk-go/services/argus v0.11.0/go.mod h1:nVllQfYODhX1q3bgwVTLO7wHOp+8NMLiKbn3u/Dg5nU= +github.com/stackitcloud/stackit-sdk-go/services/dns v0.10.0 h1:QIZfs6nJ/l2pOweH1E+wazXnlAUtqisVbYUxWAokTbc= +github.com/stackitcloud/stackit-sdk-go/services/dns v0.10.0/go.mod h1:MdZcRbs19s2NLeJmSLSoqTzm9IPIQhE1ZEMpo9gePq0= github.com/stackitcloud/stackit-sdk-go/services/iaas v0.3.0 h1:0Nb7CruTyM/HxhZQjntQUHJqwCoKjFUC9KZcBBj+c5c= github.com/stackitcloud/stackit-sdk-go/services/iaas v0.3.0/go.mod h1:XtJA9FMK/yJ0dj4HtRAogmZPRUsZiFcuwUSfHYNASjo= github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.12.0 h1:LAteZO46XmqTsmPw0QV8n8WiGM205pxrcqHqWznNmyY= @@ -174,8 +174,8 @@ github.com/stackitcloud/stackit-sdk-go/services/redis v0.14.0 h1:wcfA/3mTI7UmTFm github.com/stackitcloud/stackit-sdk-go/services/redis v0.14.0/go.mod h1:3LhiTR/DMbKR2HuleTzlFHltR1MT1KD0DeW46X6K2GE= github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.8.0 h1:7AIvLkB7JZ5lYKtYLwI0rgJ0185hwQC1PFiUrjcinDM= github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.8.0/go.mod h1:p16qz/pAW8b1gEhqMpIgJfutRPeDPqQLlbVGyCo3f8o= -github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.7.0 h1:1Ho+M4DyZHrwbDe1peW//x+/hegIuaUdZqbQEbPlr4k= -github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.7.0/go.mod h1:LX0Mcyr7/QP77zf7e05fHCJO38RMuTxr7nEDUDZ3oPQ= +github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.8.0 h1:pJBG455kmtbQFpCxcBfBK8wOuEnmsMv3h90LFcdj3q0= +github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.8.0/go.mod h1:LX0Mcyr7/QP77zf7e05fHCJO38RMuTxr7nEDUDZ3oPQ= github.com/stackitcloud/stackit-sdk-go/services/ske v0.15.0 h1:7iTzdiglvJmKMaHlr4JUPvNOmA730rAniry74cnZ8zI= github.com/stackitcloud/stackit-sdk-go/services/ske v0.15.0/go.mod h1:0fFs4R7kg+gU7FNAIzzFvlCZJz6gyZ8CFhbK3eSrAwQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/stackit/internal/services/secretsmanager/instance/resource.go b/stackit/internal/services/secretsmanager/instance/resource.go index 2d3278e4..f388c8eb 100644 --- a/stackit/internal/services/secretsmanager/instance/resource.go +++ b/stackit/internal/services/secretsmanager/instance/resource.go @@ -364,7 +364,7 @@ func (r *instanceResource) ImportState(ctx context.Context, req resource.ImportS tflog.Info(ctx, "Secrets Manager instance state imported") } -func mapFields(instance *secretsmanager.Instance, aclList *secretsmanager.AclList, model *Model) error { +func mapFields(instance *secretsmanager.Instance, aclList *secretsmanager.ListACLsResponse, model *Model) error { if instance == nil { return fmt.Errorf("response input is nil") } @@ -399,7 +399,7 @@ func mapFields(instance *secretsmanager.Instance, aclList *secretsmanager.AclLis return nil } -func mapACLs(aclList *secretsmanager.AclList, model *Model) error { +func mapACLs(aclList *secretsmanager.ListACLsResponse, model *Model) error { if aclList == nil { return fmt.Errorf("nil ACL list") } diff --git a/stackit/internal/services/secretsmanager/instance/resource_test.go b/stackit/internal/services/secretsmanager/instance/resource_test.go index 8ecf18ce..ba1e9e3e 100644 --- a/stackit/internal/services/secretsmanager/instance/resource_test.go +++ b/stackit/internal/services/secretsmanager/instance/resource_test.go @@ -20,16 +20,16 @@ import ( func TestMapFields(t *testing.T) { tests := []struct { - description string - input *secretsmanager.Instance - aclList *secretsmanager.AclList - expected Model - isValid bool + description string + input *secretsmanager.Instance + ListACLsResponse *secretsmanager.ListACLsResponse + expected Model + isValid bool }{ { "default_values", &secretsmanager.Instance{}, - &secretsmanager.AclList{}, + &secretsmanager.ListACLsResponse{}, Model{ Id: types.StringValue("pid,iid"), InstanceId: types.StringValue("iid"), @@ -44,8 +44,8 @@ func TestMapFields(t *testing.T) { &secretsmanager.Instance{ Name: utils.Ptr("name"), }, - &secretsmanager.AclList{ - Acls: &[]secretsmanager.Acl{ + &secretsmanager.ListACLsResponse{ + Acls: &[]secretsmanager.ACL{ { Cidr: utils.Ptr("cidr-1"), Id: utils.Ptr("id-cidr-1"), @@ -76,7 +76,7 @@ func TestMapFields(t *testing.T) { { "nil_response", nil, - &secretsmanager.AclList{}, + &secretsmanager.ListACLsResponse{}, Model{}, false, }, @@ -90,7 +90,7 @@ func TestMapFields(t *testing.T) { { "no_resource_id", &secretsmanager.Instance{}, - &secretsmanager.AclList{}, + &secretsmanager.ListACLsResponse{}, Model{}, false, }, @@ -101,7 +101,7 @@ func TestMapFields(t *testing.T) { ProjectId: tt.expected.ProjectId, InstanceId: tt.expected.InstanceId, } - err := mapFields(tt.input, tt.aclList, state) + err := mapFields(tt.input, tt.ListACLsResponse, state) if !tt.isValid && err == nil { t.Fatalf("Should have failed") } @@ -179,8 +179,8 @@ func TestToCreatePayload(t *testing.T) { func TestUpdateACLs(t *testing.T) { // This is the response used when getting all ACLs currently, across all tests - getAllACLsResp := secretsmanager.AclList{ - Acls: &[]secretsmanager.Acl{ + getAllACLsResp := secretsmanager.ListACLsResponse{ + Acls: &[]secretsmanager.ACL{ { Cidr: utils.Ptr("acl-1"), Id: utils.Ptr("id-acl-1"), @@ -391,7 +391,7 @@ func TestUpdateACLs(t *testing.T) { return } - resp := secretsmanager.Acl{ + resp := secretsmanager.ACL{ Cidr: utils.Ptr(cidr), Id: utils.Ptr(fmt.Sprintf("id-%s", cidr)), }