Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ linters:
- revive
- makezero
- nakedret
# - prealloc
- prealloc
- nolintlint
- staticcheck
- thelper
Expand Down Expand Up @@ -123,3 +123,4 @@ linters:
- dupl
- gosec
- gocritic
- prealloc
2 changes: 1 addition & 1 deletion GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ SUITES?=cks networking object_storage inference

testacc-sweep:
@for suite in $(SUITES); do \
go test -v -timeout 10m ./coreweave/$$suite -sweep='$(TEST_ACC_SWEEP_ZONE)'; \
go test -v -timeout 30m ./coreweave/$$suite -sweep='$(TEST_ACC_SWEEP_ZONE)'; \
done

testacc:
Expand Down
15 changes: 9 additions & 6 deletions coreweave/object_storage/data_source_bucket_policy_document.go
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,9 @@ func MustRenderBucketPolicyDocument(_ context.Context, name string, cfg *BucketP

// action list
if !s.Action.IsNull() {
var vals []cty.Value
for _, v := range s.Action.Elements() {
elements := s.Action.Elements()
vals := make([]cty.Value, 0, len(elements))
for _, v := range elements {
str := v.(types.String).ValueString()
vals = append(vals, cty.StringVal(str))
}
Expand All @@ -385,8 +386,9 @@ func MustRenderBucketPolicyDocument(_ context.Context, name string, cfg *BucketP

// resource list
if !s.Resource.IsNull() {
var vals []cty.Value
for _, v := range s.Resource.Elements() {
elements := s.Resource.Elements()
vals := make([]cty.Value, 0, len(elements))
for _, v := range elements {
str := v.(types.String).ValueString()
vals = append(vals, cty.StringVal(str))
}
Expand All @@ -399,8 +401,9 @@ func MustRenderBucketPolicyDocument(_ context.Context, name string, cfg *BucketP
for key, val := range s.Principal.Elements() {
// val is types.List
list := val.(types.List)
var elems []cty.Value
for _, ev := range list.Elements() {
elements := list.Elements()
elems := make([]cty.Value, 0, len(elements))
for _, ev := range elements {
elems = append(elems, cty.StringVal(ev.(types.String).ValueString()))
}
m[key] = cty.ListVal(elems)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -394,25 +394,25 @@ func MustRenderOrganizationAccessPolicy(ctx context.Context, resourceName string

resourceBody.SetAttributeValue("name", cty.StringVal(policy.Name.ValueString()))

statements := []cty.Value{}
statements := make([]cty.Value, 0, len(policy.Statements))
for _, s := range policy.Statements {
actionsSlice := []string{}
s.Actions.ElementsAs(ctx, &actionsSlice, false)
actions := []cty.Value{}
actions := make([]cty.Value, 0, len(actionsSlice))
for _, a := range actionsSlice {
actions = append(actions, cty.StringVal(a))
}

resourcesSlice := []string{}
s.Resources.ElementsAs(ctx, &resourcesSlice, false)
resources := []cty.Value{}
resources := make([]cty.Value, 0, len(resourcesSlice))
for _, a := range resourcesSlice {
resources = append(resources, cty.StringVal(a))
}

principalsSlice := []string{}
s.Principals.ElementsAs(ctx, &principalsSlice, false)
principals := []cty.Value{}
principals := make([]cty.Value, 0, len(principalsSlice))
for _, a := range principalsSlice {
principals = append(principals, cty.StringVal(a))
}
Expand Down
Loading