Merge branch 'master' into CLOUDP-305055

Author: fmenezes

.github/workflows/autoupdate-spec.yaml

@@ -17,30 +17,31 @@ jobs:
           go-version-file: 'go.mod'
       - run:  make update-openapi-spec
       - name: Verify Changed files
-        uses: tj-actions/verify-changed-files@9437562cb29a5a1120dd9f02cc760ec9e5d4651a
-        id: verify-changed-files
-        with:
-          files: |
-             ./tools/internal/specs/spec.yaml
+        run: |
+          FILES_CHANGED=false
+          if git diff --name-only | grep -qE '^tools/internal/specs/spec\.yaml'; then
+              FILES_CHANGED=true
+          fi
+          echo "FILES_CHANGED=${FILES_CHANGED}" >> "$GITHUB_ENV"
       - run:  make gen-api-commands
-        if: steps.verify-changed-files.outputs.files_changed == 'true'
+        if: env.FILES_CHANGED == 'true'
       - run:  make gen-docs
-        if: steps.verify-changed-files.outputs.files_changed == 'true'
+        if: env.FILES_CHANGED == 'true'
       - name: Find JIRA ticket
         id: find
-        if: steps.verify-changed-files.outputs.files_changed == 'true'
+        if: env.FILES_CHANGED == 'true'
         uses: mongodb/apix-action/find-jira@dd1d8b713effb9ac4972a3318b8e2f03b8a6d8ce
         with:
           token: ${{ secrets.JIRA_API_TOKEN }}
           jql: project = CLOUDP AND status NOT IN (Closed, Resolved) AND summary ~ "Update Autogenerated Commands"
       - name: Set JIRA ticket (find)
-        if: (steps.verify-changed-files.outputs.files_changed == 'true') && (steps.find.outputs.found == 'true')
+        if: (env.FILES_CHANGED == 'true') && (steps.find.outputs.found == 'true')
         run: |
           echo "JIRA_KEY=${{steps.find.outputs.issue-key}}" >> "$GITHUB_ENV"
       - name: Create JIRA ticket
         uses: mongodb/apix-action/create-jira@dd1d8b713effb9ac4972a3318b8e2f03b8a6d8ce
         id: create
-        if: (steps.verify-changed-files.outputs.files_changed == 'true') && (steps.find.outputs.found == 'false')
+        if: (env.FILES_CHANGED == 'true') && (steps.find.outputs.found == 'false')
         with:
           token: ${{ secrets.JIRA_API_TOKEN }}
           project-key: CLOUDP
@@ -68,19 +69,19 @@ jobs:
               }
             }
       - name: Set JIRA ticket (create)
-        if: (steps.verify-changed-files.outputs.files_changed == 'true') && (steps.find.outputs.found == 'false')
+        if: (env.FILES_CHANGED == 'true') && (steps.find.outputs.found == 'false')
         run: |
           echo "JIRA_KEY=${{steps.create.outputs.issue-key}}" >> "$GITHUB_ENV"
       - name: set Apix Bot token
-        if: steps.verify-changed-files.outputs.files_changed == 'true'
+        if: env.FILES_CHANGED == 'true'
         id: app-token
         uses: mongodb/apix-action/token@dd1d8b713effb9ac4972a3318b8e2f03b8a6d8ce
         with:
           app-id: ${{ secrets.APIXBOT_APP_ID }}
           private-key: ${{ secrets.APIXBOT_APP_PEM }}
       - uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
         id: pr
-        if: steps.verify-changed-files.outputs.files_changed == 'true'
+        if: env.FILES_CHANGED == 'true'
         with:
           token: ${{ steps.app-token.outputs.token }}
           title: "${{ env.JIRA_KEY }}: Update Autogenerated Commands"

internal/plugin/plugin.go

@@ -115,6 +115,7 @@ func GetDefaultPluginDirectory() (string, error) {
 type Command struct {
 	Name        string
 	Description string
+	Aliases     []string
 }
 
 type Github struct {
@@ -182,7 +183,8 @@ func (p *Plugin) GetCobraCommands() []*cobra.Command {
 				sourceType:       PluginSourceType,
 				sourcePluginName: p.Name,
 			},
-			RunE: p.Run,
+			RunE:    p.Run,
+			Aliases: pluginCmd.Aliases,
 		}
 
 		// Disable the default cobra help function.
@@ -241,7 +243,7 @@ func createPluginFromManifest(manifest *Manifest) (*Plugin, error) {
 	}
 
 	for cmdName, value := range manifest.Commands {
-		plugin.Commands = append(plugin.Commands, &Command{Name: cmdName, Description: value.Description})
+		plugin.Commands = append(plugin.Commands, &Command{Name: cmdName, Description: value.Description, Aliases: value.Aliases})
 	}
 
 	return &plugin, nil

internal/plugin/plugin_manifest.go

@@ -37,7 +37,8 @@ type ManifestGithubValues struct {
 }
 
 type ManifestCommand struct {
-	Description string `yaml:"description,omitempty"`
+	Aliases     []string `yaml:"aliases,omitempty"`
+	Description string   `yaml:"description,omitempty"`
 }
 
 type Manifest struct {
@@ -258,10 +259,15 @@ func getUniqueManifests(manifests []*Manifest, existingCommandsSet set.Set[strin
 }
 
 func (m *Manifest) HasDuplicateCommand(existingCommandsSet set.Set[string]) bool {
-	for cmdName := range m.Commands {
+	for cmdName, cmd := range m.Commands {
 		if existingCommandsSet.Contains(cmdName) {
 			return true
 		}
+		for _, alias := range cmd.Aliases {
+			if existingCommandsSet.Contains(alias) {
+				return true
+			}
+		}
 	}
 	return false
 }