Skip to content
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

Action Permissions - Fix fields to required #111

Merged
merged 2 commits into from
Jan 29, 2024
Merged

Action Permissions - Fix fields to required #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bb379f
fix to required
Tankilevitch Jan 27, 2024
7770fdd
fix
Tankilevitch Jan 29, 2024
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
8 changes: 1 addition & 7 deletions port/action-permissions/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,19 +96,13 @@ func (r *ActionPermissionsResource) Update(ctx context.Context, req resource.Upd
return
}

a, err := r.portClient.UpdateActionPermissions(ctx, blueprintIdentifier, actionIdentifier, permissions)
_, err = r.portClient.UpdateActionPermissions(ctx, blueprintIdentifier, actionIdentifier, permissions)

if err != nil {
resp.Diagnostics.AddError("failed to update action permissions", err.Error())
return
}

err = refreshActionPermissionsState(ctx, state, a, blueprintIdentifier, actionIdentifier)
if err != nil {
resp.Diagnostics.AddError("failed to refresh action permissions state", err.Error())
return
}

state.ID = types.StringValue(fmt.Sprintf("%s:%s", blueprintIdentifier, actionIdentifier))
state.ActionIdentifier = types.StringValue(actionIdentifier)
state.BlueprintIdentifier = types.StringValue(blueprintIdentifier)
Expand Down
38 changes: 37 additions & 1 deletion port/action-permissions/resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,6 @@ func TestAccPortActionPermissionsImportState(t *testing.T) {
value: "true",
operator: "=",
property: "$owned_by_team"

}
],
combinator: "and"
Expand Down Expand Up @@ -505,3 +504,40 @@ func TestAccPortActionPermissionsImportState(t *testing.T) {
},
})
}

func TestAccPortActionWithEmptyFieldsExpectDefaultsToApply(t *testing.T) {
blueprintIdentifier := utils.GenID()
actionIdentifier := utils.GenID()
var testAccActionPermissionsConfigCreate = testAccCreateBlueprintAndActionConfig(blueprintIdentifier, actionIdentifier) + `
resource "port_action_permissions" "create_microservice_permissions" {
action_identifier = port_action.create_microservice.identifier
blueprint_identifier = port_blueprint.microservice.identifier
permissions = {
"execute": {}
"approve": {}
}
}
`
resource.Test(t, resource.TestCase{
PreCheck: func() { acctest.TestAccPreCheck(t) },
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Config: testAccActionPermissionsConfigCreate,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("port_action_permissions.create_microservice_permissions", "action_identifier", actionIdentifier),
resource.TestCheckResourceAttr("port_action_permissions.create_microservice_permissions", "blueprint_identifier", blueprintIdentifier),
resource.TestCheckResourceAttr("port_action_permissions.create_microservice_permissions", "permissions.execute.roles.#", "0"),
resource.TestCheckResourceAttr("port_action_permissions.create_microservice_permissions", "permissions.execute.users.#", "0"),
resource.TestCheckResourceAttr("port_action_permissions.create_microservice_permissions", "permissions.execute.teams.#", "0"),
resource.TestCheckResourceAttr("port_action_permissions.create_microservice_permissions", "permissions.execute.owned_by_team", "true"),
resource.TestCheckNoResourceAttr("port_action_permissions.create_microservice_permissions", "permissions.approve.policy"),
resource.TestCheckResourceAttr("port_action_permissions.create_microservice_permissions", "permissions.approve.roles.#", "0"),
resource.TestCheckResourceAttr("port_action_permissions.create_microservice_permissions", "permissions.approve.users.#", "0"),
resource.TestCheckResourceAttr("port_action_permissions.create_microservice_permissions", "permissions.approve.teams.#", "0"),
resource.TestCheckNoResourceAttr("port_action_permissions.create_microservice_permissions", "permissions.approve.policy"),
),
},
},
})
}
23 changes: 20 additions & 3 deletions port/action-permissions/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ package action_permissions

import (
"context"
"github.com/hashicorp/terraform-plugin-framework/attr"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/listdefault"
"github.com/hashicorp/terraform-plugin-framework/types"
)

Expand All @@ -22,30 +25,38 @@ func ActionPermissionsSchema() map[string]schema.Attribute {
},
"permissions": schema.SingleNestedAttribute{
MarkdownDescription: "The permissions for the action",
Optional: true,
Required: true,
Attributes: map[string]schema.Attribute{
"execute": schema.SingleNestedAttribute{
MarkdownDescription: "The permission to execute the action",
Optional: true,
Required: true,
Attributes: map[string]schema.Attribute{
"users": schema.ListAttribute{
MarkdownDescription: "The users with execution permission",
Optional: true,
Computed: true,
Default: listdefault.StaticValue(types.ListValueMust(types.StringType, []attr.Value{})),
ElementType: types.StringType,
},
"roles": schema.ListAttribute{
MarkdownDescription: "The roles with execution permission",
Optional: true,
Computed: true,
Default: listdefault.StaticValue(types.ListValueMust(types.StringType, []attr.Value{})),
ElementType: types.StringType,
},
"teams": schema.ListAttribute{
MarkdownDescription: "The teams with execution permission",
Optional: true,
Computed: true,
Default: listdefault.StaticValue(types.ListValueMust(types.StringType, []attr.Value{})),
ElementType: types.StringType,
},
"owned_by_team": schema.BoolAttribute{
MarkdownDescription: "Give execution permission to the teams who own the entity",
Optional: true,
Computed: true,
Default: booldefault.StaticBool(true),
},
"policy": schema.StringAttribute{
MarkdownDescription: "The policy to use for execution",
Expand All @@ -55,21 +66,27 @@ func ActionPermissionsSchema() map[string]schema.Attribute {
},
"approve": schema.SingleNestedAttribute{
MarkdownDescription: "The permission to approve the action's runs",
Optional: true,
Required: true,
Attributes: map[string]schema.Attribute{
"users": schema.ListAttribute{
MarkdownDescription: "The users with approval permission",
Optional: true,
Computed: true,
Default: listdefault.StaticValue(types.ListValueMust(types.StringType, []attr.Value{})),
ElementType: types.StringType,
},
"roles": schema.ListAttribute{
MarkdownDescription: "The roles with approval permission",
Optional: true,
Computed: true,
Default: listdefault.StaticValue(types.ListValueMust(types.StringType, []attr.Value{})),
ElementType: types.StringType,
},
"teams": schema.ListAttribute{
MarkdownDescription: "The teams with approval permission",
Optional: true,
Computed: true,
Default: listdefault.StaticValue(types.ListValueMust(types.StringType, []attr.Value{})),
ElementType: types.StringType,
},
"policy": schema.StringAttribute{
Expand Down
Loading