From 89e50ca4b9c9a6cb599dc796e7bd20178c7be5af Mon Sep 17 00:00:00 2001 From: Michael Sowka Date: Fri, 14 Jun 2024 16:00:53 +0200 Subject: [PATCH 1/3] Add missing actions --- internal/services/security/resource_privilege_application.go | 2 +- .../services/security/resource_privilege_repository_admin.go | 2 +- .../security/resource_privilege_repository_content_selector.go | 2 +- .../services/security/resource_privilege_repository_view.go | 2 +- internal/services/security/resource_privilege_script.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/services/security/resource_privilege_application.go b/internal/services/security/resource_privilege_application.go index 751e9ee6..68a68a3c 100644 --- a/internal/services/security/resource_privilege_application.go +++ b/internal/services/security/resource_privilege_application.go @@ -45,7 +45,7 @@ func ResourceSecurityPrivilegeApplication() *schema.Resource { Required: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validation.StringInSlice([]string{"ADD", "READ", "EDIT", "DELETE"}, false), + ValidateFunc: validation.StringInSlice([]string{"ADD", "READ", "EDIT", "DELETE", "STOP", "DISASSOCIATE", "ASSOCIATE", "START", "ALL"}, false), }, }, }, diff --git a/internal/services/security/resource_privilege_repository_admin.go b/internal/services/security/resource_privilege_repository_admin.go index 6367bc68..de8d23aa 100644 --- a/internal/services/security/resource_privilege_repository_admin.go +++ b/internal/services/security/resource_privilege_repository_admin.go @@ -50,7 +50,7 @@ func ResourceSecurityPrivilegeRepositoryAdmin() *schema.Resource { Required: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validation.StringInSlice([]string{"ADD", "READ", "DELETE", "BROWSE", "EDIT"}, false), + ValidateFunc: validation.StringInSlice([]string{"ADD", "READ", "DELETE", "BROWSE", "EDIT", "ALL"}, false), }, }, }, diff --git a/internal/services/security/resource_privilege_repository_content_selector.go b/internal/services/security/resource_privilege_repository_content_selector.go index ce737aa4..7dacff80 100644 --- a/internal/services/security/resource_privilege_repository_content_selector.go +++ b/internal/services/security/resource_privilege_repository_content_selector.go @@ -55,7 +55,7 @@ func ResourceSecurityPrivilegeRepositoryContentSelector() *schema.Resource { Required: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validation.StringInSlice([]string{"ADD", "READ", "DELETE", "BROWSE", "EDIT"}, false), + ValidateFunc: validation.StringInSlice([]string{"ADD", "READ", "DELETE", "BROWSE", "EDIT", "ALL"}, false), }, }, }, diff --git a/internal/services/security/resource_privilege_repository_view.go b/internal/services/security/resource_privilege_repository_view.go index 335f9146..6853fc3a 100644 --- a/internal/services/security/resource_privilege_repository_view.go +++ b/internal/services/security/resource_privilege_repository_view.go @@ -50,7 +50,7 @@ func ResourceSecurityPrivilegeRepositoryView() *schema.Resource { Required: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validation.StringInSlice([]string{"ADD", "READ", "DELETE", "BROWSE", "EDIT"}, false), + ValidateFunc: validation.StringInSlice([]string{"ADD", "READ", "DELETE", "BROWSE", "EDIT", "ALL"}, false), }, }, }, diff --git a/internal/services/security/resource_privilege_script.go b/internal/services/security/resource_privilege_script.go index 65b38211..3d0bcbfa 100644 --- a/internal/services/security/resource_privilege_script.go +++ b/internal/services/security/resource_privilege_script.go @@ -45,7 +45,7 @@ func ResourceSecurityPrivilegeScript() *schema.Resource { Required: true, Elem: &schema.Schema{ Type: schema.TypeString, - ValidateFunc: validation.StringInSlice([]string{"ADD", "READ", "DELETE", "RUN", "BROWSE", "EDIT"}, false), + ValidateFunc: validation.StringInSlice([]string{"ADD", "READ", "DELETE", "RUN", "BROWSE", "EDIT", "ALL"}, false), }, }, }, From 0bfb45c07fbec63c1cc4b91b29f97be01a83abca Mon Sep 17 00:00:00 2001 From: Michael Sowka Date: Mon, 17 Jun 2024 16:32:07 +0200 Subject: [PATCH 2/3] Extend tests for missing Actions --- .../security/resource_privilege_application_test.go | 7 ++++++- .../security/resource_privilege_repository_admin_test.go | 3 ++- .../resource_privilege_repository_content_selector_test.go | 3 ++- .../security/resource_privilege_repository_view_test.go | 3 ++- .../services/security/resource_privilege_script_test.go | 3 ++- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/internal/services/security/resource_privilege_application_test.go b/internal/services/security/resource_privilege_application_test.go index 35b0f425..4eb4eb48 100644 --- a/internal/services/security/resource_privilege_application_test.go +++ b/internal/services/security/resource_privilege_application_test.go @@ -17,7 +17,7 @@ func TestAccResourceSecurityPrivilegeApplication(t *testing.T) { privilege := security.PrivilegeApplication{ Name: acctest.RandString(20), Description: acctest.RandString(20), - Actions: []security.SecurityPrivilegeApplicationActions{"ADD", "READ", "EDIT", "DELETE"}, + Actions: []security.SecurityPrivilegeApplicationActions{"ADD", "READ", "EDIT", "DELETE", "STOP", "DISASSOCIATE", "ASSOCIATE", "START", "ALL"}, Domain: acctest.RandString(20), } @@ -35,6 +35,11 @@ func TestAccResourceSecurityPrivilegeApplication(t *testing.T) { resource.TestCheckResourceAttr(resName, "actions.1", string(privilege.Actions[1])), resource.TestCheckResourceAttr(resName, "actions.2", string(privilege.Actions[2])), resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[3])), + resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[4])), + resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[5])), + resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[6])), + resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[7])), + resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[8])), ), }, }, diff --git a/internal/services/security/resource_privilege_repository_admin_test.go b/internal/services/security/resource_privilege_repository_admin_test.go index 855b70a8..93ab8240 100644 --- a/internal/services/security/resource_privilege_repository_admin_test.go +++ b/internal/services/security/resource_privilege_repository_admin_test.go @@ -17,7 +17,7 @@ func TestAccResourceSecurityPrivilegeRepositoryAdmin(t *testing.T) { privilege := security.PrivilegeRepositoryAdmin{ Name: acctest.RandString(20), Description: acctest.RandString(20), - Actions: []security.SecurityPrivilegeRepositoryAdminActions{"ADD", "READ", "DELETE", "BROWSE", "EDIT"}, + Actions: []security.SecurityPrivilegeRepositoryAdminActions{"ADD", "READ", "DELETE", "BROWSE", "EDIT", "ALL"}, Repository: acctest.RandString(20), Format: "helm", } @@ -37,6 +37,7 @@ func TestAccResourceSecurityPrivilegeRepositoryAdmin(t *testing.T) { resource.TestCheckResourceAttr(resName, "actions.2", string(privilege.Actions[2])), resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[3])), resource.TestCheckResourceAttr(resName, "actions.4", string(privilege.Actions[4])), + resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[5])), ), }, }, diff --git a/internal/services/security/resource_privilege_repository_content_selector_test.go b/internal/services/security/resource_privilege_repository_content_selector_test.go index ce8a7b8a..855d393a 100644 --- a/internal/services/security/resource_privilege_repository_content_selector_test.go +++ b/internal/services/security/resource_privilege_repository_content_selector_test.go @@ -17,7 +17,7 @@ func TestAccResourceSecurityPrivilegeRepositoryContentSelector(t *testing.T) { privilege := security.PrivilegeRepositoryContentSelector{ Name: acctest.RandString(20), Description: acctest.RandString(20), - Actions: []security.SecurityPrivilegeRepositoryContentSelectorActions{"ADD", "READ", "DELETE", "BROWSE", "EDIT"}, + Actions: []security.SecurityPrivilegeRepositoryContentSelectorActions{"ADD", "READ", "DELETE", "BROWSE", "EDIT", "ALL"}, Repository: acctest.RandString(20), Format: "helm", ContentSelector: acctest.RandString(20), @@ -39,6 +39,7 @@ func TestAccResourceSecurityPrivilegeRepositoryContentSelector(t *testing.T) { resource.TestCheckResourceAttr(resName, "actions.2", string(privilege.Actions[2])), resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[3])), resource.TestCheckResourceAttr(resName, "actions.4", string(privilege.Actions[4])), + resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[5])), ), }, }, diff --git a/internal/services/security/resource_privilege_repository_view_test.go b/internal/services/security/resource_privilege_repository_view_test.go index 5ec80634..83202e80 100644 --- a/internal/services/security/resource_privilege_repository_view_test.go +++ b/internal/services/security/resource_privilege_repository_view_test.go @@ -17,7 +17,7 @@ func TestAccResourceSecurityPrivilegeRepositoryView(t *testing.T) { privilege := security.PrivilegeRepositoryView{ Name: acctest.RandString(20), Description: acctest.RandString(20), - Actions: []security.SecurityPrivilegeRepositoryViewActions{"ADD", "READ", "DELETE", "BROWSE", "EDIT"}, + Actions: []security.SecurityPrivilegeRepositoryViewActions{"ADD", "READ", "DELETE", "BROWSE", "EDIT", "ALL"}, Repository: acctest.RandString(20), Format: "helm", } @@ -37,6 +37,7 @@ func TestAccResourceSecurityPrivilegeRepositoryView(t *testing.T) { resource.TestCheckResourceAttr(resName, "actions.2", string(privilege.Actions[2])), resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[3])), resource.TestCheckResourceAttr(resName, "actions.4", string(privilege.Actions[4])), + resource.TestCheckResourceAttr(resName, "actions.4", string(privilege.Actions[5])), ), }, }, diff --git a/internal/services/security/resource_privilege_script_test.go b/internal/services/security/resource_privilege_script_test.go index 2bb9beb7..c1e93dbc 100644 --- a/internal/services/security/resource_privilege_script_test.go +++ b/internal/services/security/resource_privilege_script_test.go @@ -17,7 +17,7 @@ func TestAccResourceSecurityPrivilegeScript(t *testing.T) { privilege := security.PrivilegeScript{ Name: acctest.RandString(20), Description: acctest.RandString(20), - Actions: []security.SecurityPrivilegeScriptActions{"ADD", "READ", "DELETE", "RUN", "BROWSE", "EDIT"}, + Actions: []security.SecurityPrivilegeScriptActions{"ADD", "READ", "DELETE", "RUN", "BROWSE", "EDIT", "ALL"}, ScriptName: acctest.RandString(20), } resource.Test(t, resource.TestCase{ @@ -36,6 +36,7 @@ func TestAccResourceSecurityPrivilegeScript(t *testing.T) { resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[3])), resource.TestCheckResourceAttr(resName, "actions.4", string(privilege.Actions[4])), resource.TestCheckResourceAttr(resName, "actions.5", string(privilege.Actions[5])), + resource.TestCheckResourceAttr(resName, "actions.4", string(privilege.Actions[6])), ), }, }, From 2e6847068fcc19f2683c1142642cc08f079a067a Mon Sep 17 00:00:00 2001 From: Michael Sowka Date: Wed, 19 Jun 2024 10:31:39 +0200 Subject: [PATCH 3/3] Fix Tests naming --- .../security/resource_privilege_application_test.go | 10 +++++----- .../resource_privilege_repository_admin_test.go | 2 +- ...ource_privilege_repository_content_selector_test.go | 2 +- .../resource_privilege_repository_view_test.go | 2 +- .../security/resource_privilege_script_test.go | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/services/security/resource_privilege_application_test.go b/internal/services/security/resource_privilege_application_test.go index 4eb4eb48..9b42a70f 100644 --- a/internal/services/security/resource_privilege_application_test.go +++ b/internal/services/security/resource_privilege_application_test.go @@ -35,11 +35,11 @@ func TestAccResourceSecurityPrivilegeApplication(t *testing.T) { resource.TestCheckResourceAttr(resName, "actions.1", string(privilege.Actions[1])), resource.TestCheckResourceAttr(resName, "actions.2", string(privilege.Actions[2])), resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[3])), - resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[4])), - resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[5])), - resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[6])), - resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[7])), - resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[8])), + resource.TestCheckResourceAttr(resName, "actions.4", string(privilege.Actions[4])), + resource.TestCheckResourceAttr(resName, "actions.5", string(privilege.Actions[5])), + resource.TestCheckResourceAttr(resName, "actions.6", string(privilege.Actions[6])), + resource.TestCheckResourceAttr(resName, "actions.7", string(privilege.Actions[7])), + resource.TestCheckResourceAttr(resName, "actions.8", string(privilege.Actions[8])), ), }, }, diff --git a/internal/services/security/resource_privilege_repository_admin_test.go b/internal/services/security/resource_privilege_repository_admin_test.go index 93ab8240..8e497f6c 100644 --- a/internal/services/security/resource_privilege_repository_admin_test.go +++ b/internal/services/security/resource_privilege_repository_admin_test.go @@ -37,7 +37,7 @@ func TestAccResourceSecurityPrivilegeRepositoryAdmin(t *testing.T) { resource.TestCheckResourceAttr(resName, "actions.2", string(privilege.Actions[2])), resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[3])), resource.TestCheckResourceAttr(resName, "actions.4", string(privilege.Actions[4])), - resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[5])), + resource.TestCheckResourceAttr(resName, "actions.5", string(privilege.Actions[5])), ), }, }, diff --git a/internal/services/security/resource_privilege_repository_content_selector_test.go b/internal/services/security/resource_privilege_repository_content_selector_test.go index 855d393a..e317b807 100644 --- a/internal/services/security/resource_privilege_repository_content_selector_test.go +++ b/internal/services/security/resource_privilege_repository_content_selector_test.go @@ -39,7 +39,7 @@ func TestAccResourceSecurityPrivilegeRepositoryContentSelector(t *testing.T) { resource.TestCheckResourceAttr(resName, "actions.2", string(privilege.Actions[2])), resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[3])), resource.TestCheckResourceAttr(resName, "actions.4", string(privilege.Actions[4])), - resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[5])), + resource.TestCheckResourceAttr(resName, "actions.5", string(privilege.Actions[5])), ), }, }, diff --git a/internal/services/security/resource_privilege_repository_view_test.go b/internal/services/security/resource_privilege_repository_view_test.go index 83202e80..f0b9b142 100644 --- a/internal/services/security/resource_privilege_repository_view_test.go +++ b/internal/services/security/resource_privilege_repository_view_test.go @@ -37,7 +37,7 @@ func TestAccResourceSecurityPrivilegeRepositoryView(t *testing.T) { resource.TestCheckResourceAttr(resName, "actions.2", string(privilege.Actions[2])), resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[3])), resource.TestCheckResourceAttr(resName, "actions.4", string(privilege.Actions[4])), - resource.TestCheckResourceAttr(resName, "actions.4", string(privilege.Actions[5])), + resource.TestCheckResourceAttr(resName, "actions.5", string(privilege.Actions[5])), ), }, }, diff --git a/internal/services/security/resource_privilege_script_test.go b/internal/services/security/resource_privilege_script_test.go index c1e93dbc..da0362fb 100644 --- a/internal/services/security/resource_privilege_script_test.go +++ b/internal/services/security/resource_privilege_script_test.go @@ -36,7 +36,7 @@ func TestAccResourceSecurityPrivilegeScript(t *testing.T) { resource.TestCheckResourceAttr(resName, "actions.3", string(privilege.Actions[3])), resource.TestCheckResourceAttr(resName, "actions.4", string(privilege.Actions[4])), resource.TestCheckResourceAttr(resName, "actions.5", string(privilege.Actions[5])), - resource.TestCheckResourceAttr(resName, "actions.4", string(privilege.Actions[6])), + resource.TestCheckResourceAttr(resName, "actions.6", string(privilege.Actions[6])), ), }, },