feat: Add tags to ssh_keys

ericvhileman · Mar 31, 2024 · 0bb175a · 0bb175a
1 parent 649dcde
commit 0bb175a
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 1 deletion.
diff --git a/cli/get_project_ssh_keys_operation.go b/cli/get_project_ssh_keys_operation.go
@@ -38,6 +38,9 @@ func runOperationSSHKeysGetProjectSSHKeys(cmd *cobra.Command, args []string) err
 	if err, _ := retrieveOperationSSHKeysGetProjectSSHKeysProjectIDOrSlugFlag(params, "", cmd); err != nil {
 		return err
 	}
+	if err, _ := retrieveOperationSSHKeysFilterTagsFlag(params, "", cmd); err != nil {
+		return err
+	}
 	if dryRun {
 
 		logDebugf("dry-run flag specified. Skip sending request.")
@@ -61,6 +64,9 @@ func registerOperationSSHKeysGetProjectSSHKeysParamFlags(cmd *cobra.Command) err
 	if err := registerOperationSSHKeysGetProjectSSHKeysProjectIDOrSlugParamFlags("", cmd); err != nil {
 		return err
 	}
+	if err := registerOperationSSHKeysFilterTagsFlag("", cmd); err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -83,6 +89,24 @@ func registerOperationSSHKeysGetProjectSSHKeysProjectIDOrSlugParamFlags(cmdPrefi
 	return nil
 }
 
+func registerOperationSSHKeysFilterTagsFlag(cmdPrefix string, cmd *cobra.Command) error {
+
+	filterTagsDescription := `The Tags to filter by`
+
+	var filterTagsFlagName string
+	if cmdPrefix == "" {
+		filterTagsFlagName = "tags"
+	} else {
+		filterTagsFlagName = fmt.Sprintf("%v.tags", cmdPrefix)
+	}
+
+	var filterTagsFlagDefault = ""
+
+	_ = cmd.PersistentFlags().String(filterTagsFlagName, filterTagsFlagDefault, filterTagsDescription)
+
+	return nil
+}
+
 func retrieveOperationSSHKeysGetProjectSSHKeysProjectIDOrSlugFlag(m *ssh_keys.GetProjectSSHKeysParams, cmdPrefix string, cmd *cobra.Command) (error, bool) {
 	retAdded := false
 	if cmd.Flags().Changed("project") {
@@ -103,3 +127,24 @@ func retrieveOperationSSHKeysGetProjectSSHKeysProjectIDOrSlugFlag(m *ssh_keys.Ge
 	}
 	return nil, retAdded
 }
+
+func retrieveOperationSSHKeysFilterTagsFlag(m *ssh_keys.GetProjectSSHKeysParams, cmdPrefix string, cmd *cobra.Command) (error, bool) {
+	retAdded := false
+	if cmd.Flags().Changed("tags") {
+
+		var filterTagsFlagName string
+		if cmdPrefix == "" {
+			filterTagsFlagName = "tags"
+		} else {
+			filterTagsFlagName = fmt.Sprintf("%v.tags", cmdPrefix)
+		}
+
+		filterTagsFlagValue, err := cmd.Flags().GetString(filterTagsFlagName)
+		if err != nil {
+			return err, false
+		}
+		m.FilterTags = &filterTagsFlagValue
+
+	}
+	return nil, retAdded
+}
diff --git a/cli/put_project_ssh_key_operation.go b/cli/put_project_ssh_key_operation.go
@@ -63,6 +63,12 @@ func (o *UpdateSSHKeyOperation) registerFlags(cmd *cobra.Command) {
 			Description: "Name of the SSH Key",
 			Required:    true,
 		},
+		&cmdflag.StringSlice{
+			Name:        "tags",
+			Label:       "Tags",
+			Description: "Tags",
+			Required:    false,
+		},
 	}
 
 	o.PathParamFlags.Register(pathParamsSchema)

diff --git a/client/ssh_keys/get_project_ssh_keys_parameters.go b/client/ssh_keys/get_project_ssh_keys_parameters.go
diff --git a/client/ssh_keys/put_project_ssh_key_responses.go b/client/ssh_keys/put_project_ssh_key_responses.go
@@ -495,6 +495,8 @@ type PutProjectSSHKeyParamsBodyDataAttributes struct {
 
 	// Name of the SSH Key
 	Name string `json:"name,omitempty"`
+
+	Tags []string `json:"tags,omitempty"`
 }
 
 // Validate validates this put project SSH key params body data attributes

diff --git a/models/ssh_key_data.go b/models/ssh_key_data.go
@@ -169,6 +169,10 @@ func (m *SSHKeyData) TableRow() table.Row {
 			Label: "ID",
 			Value: table.String(m.ID),
 		},
+		"tags": table.Cell{
+			Label: "Tags",
+			Value: table.StringList(tags(attr.Tags), ","),
+		},
 		"name": table.Cell{
 			Label: "Name",
 			Value: table.String(attr.Name),
@@ -193,7 +197,7 @@ func (m *SSHKeyData) TableRow() table.Row {
 //
 // swagger:model SSHKeyDataAttributes
 type SSHKeyDataAttributes struct {
-
+	Tags []*TagsIncude `json:"tags,omitempty"`
 	// created at
 	CreatedAt string `json:"created_at,omitempty"`