Skip to content

Commit

Permalink
use map[string]string instead
Browse files Browse the repository at this point in the history 
Signed-off-by: Divyam Goel <dgoel@purestorage.com>
  • Loading branch information
@dgoel-px
dgoel-px committed Jul 17, 2024
1 parent 52bc25c commit cb07b3e
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 90 deletions.
11 changes: 4 additions & 7 deletions drivers/storage/portworx/component/autopilot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,13 +263,10 @@ func (c *autopilot) createConfigMap(
if key == AutopilotDefaultReviewersKey {
params += fmt.Sprintf(`
%s:`, AutopilotDefaultReviewersKey)
var reviewers []interface{} = val.([]interface{})
for _, reviewer := range reviewers {
if r, ok := reviewer.(string); ok {
r = strings.TrimSpace(r)
params += fmt.Sprintf(`
- "%s"`, r)
}
for _, reviewer := range strings.Split(val, ",") {
reviewer = strings.TrimSpace(reviewer)
params += fmt.Sprintf(`
- "%s"`, reviewer)
}
continue
}
Expand Down
96 changes: 48 additions & 48 deletions drivers/storage/portworx/components_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3568,14 +3568,14 @@ func TestAutopilotInstall(t *testing.T) {
GitOps: &corev1.GitOpsSpec{
Name: "test",
Type: "bitbucket-scm",
Params: corev1.GitOpsSpecParams{
DefaultReviewers: []string{"user1", "user2"},
User: "oksana",
Repo: "autopilot-bb",
Folder: "workloads",
BaseUrl: "http://10.13.108.10:7990",
ProjectKey: "PXAUT",
Branch: "master",
Params: map[string]string{
"defaultReviewers": "user1,user2",
"user": "oksana",
"repo": "autopilot-bb",
"folder": "workloads",
"baseUrl": "http://10.13.108.10:7990",
"projectKey": "PXAUT",
"branch": "master",
},
},
Args: map[string]string{
Expand Down Expand Up @@ -5059,14 +5059,14 @@ func TestAutopilotInstallAndUninstallOnOpenshift414(t *testing.T) {
GitOps: &corev1.GitOpsSpec{
Name: "test",
Type: "bitbucket-scm",
Params: corev1.GitOpsSpecParams{
DefaultReviewers: []string{"user1", "user2"},
User: "oksana",
Repo: "autopilot-bb",
Folder: "workloads",
BaseUrl: "http://10.13.108.10:7990",
ProjectKey: "PXAUT",
Branch: "master",
Params: map[string]string{
"defaultReviewers": "user1,user2",
"user": "oksana",
"repo": "autopilot-bb",
"folder": "workloads",
"baseUrl": "http://10.13.108.10:7990",
"projectKey": "PXAUT",
"branch": "master",
},
},
Args: map[string]string{
Expand Down Expand Up @@ -5236,14 +5236,14 @@ func TestAutopilotWithOCPSecretNotFound(t *testing.T) {
GitOps: &corev1.GitOpsSpec{
Name: "test",
Type: "bitbucket-scm",
Params: corev1.GitOpsSpecParams{
DefaultReviewers: []string{"user1", "user2"},
User: "oksana",
Repo: "autopilot-bb",
Folder: "workloads",
BaseUrl: "http://10.13.108.10:7990",
ProjectKey: "PXAUT",
Branch: "master",
Params: map[string]string{
"defaultReviewers": "user1,user2",
"user": "oksana",
"repo": "autopilot-bb",
"folder": "workloads",
"baseUrl": "http://10.13.108.10:7990",
"projectKey": "PXAUT",
"branch": "master",
},
},
Args: map[string]string{
Expand Down Expand Up @@ -5364,14 +5364,14 @@ func TestDisableEnableAutopilotOCP414(t *testing.T) {
GitOps: &corev1.GitOpsSpec{
Name: "test",
Type: "bitbucket-scm",
Params: corev1.GitOpsSpecParams{
DefaultReviewers: []string{"user1", "user2"},
User: "oksana",
Repo: "autopilot-bb",
Folder: "workloads",
BaseUrl: "http://10.13.108.10:7990",
ProjectKey: "PXAUT",
Branch: "master",
Params: map[string]string{
"defaultReviewers": "user1,user2",
"user": "oksana",
"repo": "autopilot-bb",
"folder": "workloads",
"baseUrl": "http://10.13.108.10:7990",
"projectKey": "PXAUT",
"branch": "master",
},
},
Args: map[string]string{
Expand Down Expand Up @@ -5548,14 +5548,14 @@ func TestAutopilotProviderURLOnOCP414(t *testing.T) {
GitOps: &corev1.GitOpsSpec{
Name: "test",
Type: "bitbucket-scm",
Params: corev1.GitOpsSpecParams{
DefaultReviewers: []string{"user1", "user2"},
User: "oksana",
Repo: "autopilot-bb",
Folder: "workloads",
BaseUrl: "http://10.13.108.10:7990",
ProjectKey: "PXAUT",
Branch: "master",
Params: map[string]string{
"defaultReviewers": "user1,user2",
"user": "oksana",
"repo": "autopilot-bb",
"folder": "workloads",
"baseUrl": "http://10.13.108.10:7990",
"projectKey": "PXAUT",
"branch": "master",
},
},
Args: map[string]string{
Expand Down Expand Up @@ -5670,14 +5670,14 @@ func TestAutopilotInstallAndUninstallOnOpenshift415(t *testing.T) {
GitOps: &corev1.GitOpsSpec{
Name: "test",
Type: "bitbucket-scm",
Params: corev1.GitOpsSpecParams{
DefaultReviewers: []string{"user1", "user2"},
User: "oksana",
Repo: "autopilot-bb",
Folder: "workloads",
BaseUrl: "http://10.13.108.10:7990",
ProjectKey: "PXAUT",
Branch: "master",
Params: map[string]string{
"defaultReviewers": "user1,user2",
"user": "oksana",
"repo": "autopilot-bb",
"folder": "workloads",
"baseUrl": "http://10.13.108.10:7990",
"projectKey": "PXAUT",
"branch": "master",
},
},
Args: map[string]string{
Expand Down
16 changes: 3 additions & 13 deletions pkg/apis/core/v1/storagecluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -555,19 +555,9 @@ type DataProviderSpec struct {

// GitOpsSpec contains the details for GitOps provider like github or bitbucket
type GitOpsSpec struct {
Name string `json:"name,omitempty"`
Type string `json:"type,omitempty"`
Params GitOpsSpecParams `json:"params,omitempty"`
}

type GitOpsSpecParams struct {
DefaultReviewers []string `json:"defaultReviewers,omitempty"`
User string `json:"user,omitempty"`
Repo string `json:"repo,omitempty"`
Folder string `json:"folder,omitempty"`
BaseUrl string `json:"baseUrl,omitempty"`
ProjectKey string `json:"projectKey,omitempty"`
Branch string `json:"branch,omitempty"`
Name string `json:"name,omitempty"`
Type string `json:"type,omitempty"`
Params map[string]string `json:"params,omitempty"`
}

// MonitoringSpec contains monitoring configuration for the storage cluster.
Expand Down
29 changes: 7 additions & 22 deletions pkg/apis/core/v1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cb07b3e

Please sign in to comment.