@@ -3,7 +3,6 @@ package policy
33import (
44 "encoding/json"
55 "fmt"
6- "time"
76
87 "github.com/MakeNowJust/heredoc/v2"
98 "github.com/ctrlplanedev/cli/internal/api"
@@ -20,10 +19,6 @@ func NewCreatePolicyCmd() *cobra.Command {
2019 var deploymentTargetSelector string
2120 var environmentTargetSelector string
2221 var resourceTargetSelector string
23- var denyWindows string
24- var versionAnyApprovals string
25- var versionUserApprovals string
26- var versionRoleApprovals string
2722 var deploymentVersionSelector string
2823
2924 cmd := & cobra.Command {
@@ -88,58 +83,6 @@ func NewCreatePolicyCmd() *cobra.Command {
8883 resourceSelector = & parsedSelector
8984 }
9085
91- // Parse deny windows
92- var parsedDenyWindows []struct {
93- Dtend * time.Time `json:"dtend,omitempty"`
94- Rrule * map [string ]interface {} `json:"rrule,omitempty"`
95- TimeZone string `json:"timeZone"`
96- }
97- if denyWindows != "" {
98- if err := json .Unmarshal ([]byte (denyWindows ), & parsedDenyWindows ); err != nil {
99- return fmt .Errorf ("invalid deny windows JSON: %w" , err )
100- }
101- }
102-
103- // Parse version any approvals
104- var parsedVersionAnyApprovals * []struct {
105- RequiredApprovalsCount * float32 `json:"requiredApprovalsCount,omitempty"`
106- }
107- if versionAnyApprovals != "" {
108- var approvals []struct {
109- RequiredApprovalsCount * float32 `json:"requiredApprovalsCount,omitempty"`
110- }
111- if err := json .Unmarshal ([]byte (versionAnyApprovals ), & approvals ); err != nil {
112- return fmt .Errorf ("invalid version any approvals JSON: %w" , err )
113- }
114- parsedVersionAnyApprovals = & approvals
115- }
116-
117- // Parse version user approvals
118- var parsedVersionUserApprovals []api.VersionUserApproval
119- if versionUserApprovals != "" {
120- if err := json .Unmarshal ([]byte (versionUserApprovals ), & parsedVersionUserApprovals ); err != nil {
121- return fmt .Errorf ("invalid version user approvals JSON: %w" , err )
122- }
123- } else {
124- parsedVersionUserApprovals = []api.VersionUserApproval {}
125- }
126-
127- // Parse version role approvals
128- var parsedVersionRoleApprovals []struct {
129- RequiredApprovalsCount * float32 `json:"requiredApprovalsCount,omitempty"`
130- RoleId * string `json:"roleId,omitempty"`
131- }
132- if versionRoleApprovals != "" {
133- if err := json .Unmarshal ([]byte (versionRoleApprovals ), & parsedVersionRoleApprovals ); err != nil {
134- return fmt .Errorf ("invalid version role approvals JSON: %w" , err )
135- }
136- } else {
137- parsedVersionRoleApprovals = []struct {
138- RequiredApprovalsCount * float32 `json:"requiredApprovalsCount,omitempty"`
139- RoleId * string `json:"roleId,omitempty"`
140- }{}
141- }
142-
14386 // Parse deployment version selector
14487 var parsedDeploymentVersionSelector * api.DeploymentVersionSelector
14588 if deploymentVersionSelector != "" {
@@ -169,11 +112,7 @@ func NewCreatePolicyCmd() *cobra.Command {
169112 ResourceSelector : resourceSelector ,
170113 },
171114 },
172- DenyWindows : parsedDenyWindows ,
173115 DeploymentVersionSelector : parsedDeploymentVersionSelector ,
174- VersionAnyApprovals : parsedVersionAnyApprovals ,
175- VersionUserApprovals : parsedVersionUserApprovals ,
176- VersionRoleApprovals : parsedVersionRoleApprovals ,
177116 }
178117
179118 resp , err := client .CreatePolicy (cmd .Context (), body )
@@ -194,10 +133,7 @@ func NewCreatePolicyCmd() *cobra.Command {
194133 cmd .Flags ().StringVar (& deploymentTargetSelector , "deployment-selector" , "" , "JSON string for deployment target selector" )
195134 cmd .Flags ().StringVar (& environmentTargetSelector , "environment-selector" , "" , "JSON string for environment target selector" )
196135 cmd .Flags ().StringVar (& resourceTargetSelector , "resource-selector" , "" , "JSON string for resource target selector" )
197- cmd .Flags ().StringVar (& denyWindows , "deny-windows" , "" , "JSON string for deny windows" )
198- cmd .Flags ().StringVar (& versionAnyApprovals , "version-any-approvals" , "" , "JSON string for version any approvals" )
199- cmd .Flags ().StringVar (& versionUserApprovals , "version-user-approvals" , "" , "JSON string for version user approvals" )
200- cmd .Flags ().StringVar (& versionRoleApprovals , "version-role-approvals" , "" , "JSON string for version role approvals" )
136+
201137 cmd .Flags ().StringVar (& deploymentVersionSelector , "version-selector" , "" , "JSON string for version selector" )
202138
203139 // Mark required flags
0 commit comments