Application resource connection, save git username (#34)

Author: jasonzbao

clients/api/client.go

@@ -299,6 +299,38 @@ func (c *Client) GetVersionStatus(applicationID, organizationID, versionID strin
 	return &resp, nil
 }
 
+// --- Resource endpoints ---
+
+// GetResources retrieves all resources for an organization
+func (c *Client) GetResources(organizationID string) (*GetResourcesResponse, error) {
+	req := GetResourcesRequest{
+		OrganizationID: organizationID,
+	}
+
+	var resp GetResourcesResponse
+	err := c.doRequest("POST", "/resources", req, &resp)
+	if err != nil {
+		return nil, err
+	}
+	return &resp, nil
+}
+
+// SaveApplicationResources saves the selected resources for an application
+func (c *Client) SaveApplicationResources(organizationID, applicationID string, resourceIDs []string) (*SaveApplicationResourcesResponse, error) {
+	req := SaveApplicationResourcesRequest{
+		OrganizationID: organizationID,
+		ApplicationID:  applicationID,
+		ResourceIDs:    resourceIDs,
+	}
+
+	var resp SaveApplicationResourcesResponse
+	err := c.doRequest("POST", "/application-resources", req, &resp)
+	if err != nil {
+		return nil, err
+	}
+	return &resp, nil
+}
+
 // --- Version Check endpoints ---
 
 // CheckVersion checks if the CLI version is up to date

clients/api/structs.go

@@ -161,6 +161,32 @@ type GetVersionStatusResponse struct {
 	DeploymentError string          `json:"deploymentError,omitempty"`
 }
 
+// --- Resource structs ---
+
+// GetResourcesRequest represents the request body for POST /resources
+type GetResourcesRequest struct {
+	OrganizationID string `json:"organizationId"`
+}
+
+// GetResourcesResponse represents the response from POST /resources
+type GetResourcesResponse struct {
+	Error     *AppErrorDetail `json:"error,omitempty"`
+	Resources []ResourceItem  `json:"resources,omitempty"`
+}
+
+// SaveApplicationResourcesRequest represents the request body for POST /application-resources
+type SaveApplicationResourcesRequest struct {
+	OrganizationID string   `json:"organizationId"`
+	ApplicationID  string   `json:"applicationId"`
+	ResourceIDs    []string `json:"resourceIds"`
+}
+
+// SaveApplicationResourcesResponse represents the response from POST /application-resources
+type SaveApplicationResourcesResponse struct {
+	Error   *AppErrorDetail `json:"error,omitempty"`
+	Success bool            `json:"success,omitempty"`
+}
+
 // --- Version Check structs ---
 
 // CheckVersionResponse represents the response from GET /version/check

clients/token/token.go

@@ -15,6 +15,8 @@ const (
 	keyringOrgUser = "default-org"
 	// keyringOrgName is the name for storing the default organization name in the system keyring
 	keyringOrgName = "default-org-name"
+	// keyringGithubUsername is the key for storing the GitHub username in the system keyring
+	keyringGithubUsername = "github-username"
 )
 
 // storeToken saves the access token to the system keyring
@@ -82,3 +84,39 @@ func DeleteDefaultOrg() error {
 	}
 	return nil
 }
+
+// StoreGithubUsername saves the GitHub username to the system keyring
+func StoreGithubUsername(username string) error {
+	err := keyring.Set(keyringService, keyringGithubUsername, username)
+	if err != nil {
+		return fmt.Errorf("failed to store GitHub username in keyring: %w", err)
+	}
+	return nil
+}
+
+// GetGithubUsername retrieves the GitHub username from the system keyring
+// Returns empty string and nil error if not found
+func GetGithubUsername() (string, error) {
+	username, err := keyring.Get(keyringService, keyringGithubUsername)
+	if err != nil {
+		// Check if it's a "not found" error
+		if err == keyring.ErrNotFound {
+			return "", nil
+		}
+		return "", fmt.Errorf("failed to get GitHub username from keyring: %w", err)
+	}
+	return username, nil
+}
+
+// DeleteGithubUsername removes the GitHub username from the system keyring
+func DeleteGithubUsername() error {
+	err := keyring.Delete(keyringService, keyringGithubUsername)
+	if err != nil {
+		// Ignore "not found" errors
+		if err == keyring.ErrNotFound {
+			return nil
+		}
+		return fmt.Errorf("failed to delete GitHub username from keyring: %w", err)
+	}
+	return nil
+}

cmd/app/create.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/charmbracelet/bubbles/key"
 	"github.com/charmbracelet/huh"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/major-technology/cli/clients/api"
@@ -134,6 +135,13 @@ func runCreate(cobraCmd *cobra.Command) error {
 		return fmt.Errorf("failed to ensure repository access: %w", err)
 	}
 
+	// Select resources for the application
+	cobraCmd.Println("\nSelecting resources for your application...")
+	if err := selectApplicationResources(cobraCmd, orgID, createResp.ApplicationID); err != nil {
+		errorStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("9")) // Red
+		cobraCmd.Println(errorStyle.Render("Failed to configure resources. Please run 'major app resources' to configure them later."))
+	}
+
 	// Push to the new remote
 	cobraCmd.Println("\nPushing to new repository...")
 	if err := git.Push(tempDir); err != nil {
@@ -242,3 +250,80 @@ func printSuccessMessage(cobraCmd *cobra.Command, appName string) {
 	cobraCmd.Println(cdInstruction)
 	cobraCmd.Println(box)
 }
+
+// selectApplicationResources prompts the user to select resources for the application
+func selectApplicationResources(cobraCmd *cobra.Command, orgID, appID string) error {
+	// Get the API client
+	apiClient := singletons.GetAPIClient()
+
+	// Fetch available resources
+	resourcesResp, err := apiClient.GetResources(orgID)
+	if ok := api.CheckErr(cobraCmd, err); !ok {
+		return err
+	}
+
+	// Check if there are any resources available
+	if len(resourcesResp.Resources) == 0 {
+		cobraCmd.Println("No resources available in this organization.")
+		return nil
+	}
+
+	// Create options for the multiselect
+	options := make([]huh.Option[string], len(resourcesResp.Resources))
+	for i, resource := range resourcesResp.Resources {
+		// Format: "Name - Description"
+		label := resource.Name
+		if resource.Description != "" {
+			label = fmt.Sprintf("%s - %s", resource.Name, resource.Description)
+		}
+		options[i] = huh.NewOption(label, resource.ID)
+	}
+
+	// Create custom keymap where 'n' submits instead of enter
+	customKeyMap := huh.NewDefaultKeyMap()
+	customKeyMap.MultiSelect.Toggle = key.NewBinding(
+		key.WithKeys(" ", "enter"),
+		key.WithHelp("space/enter", "toggle"),
+	)
+	customKeyMap.MultiSelect.Submit = key.NewBinding(
+		key.WithKeys("n"),
+		key.WithHelp("n", "continue"),
+	)
+	// Disable the default next/prev behavior on enter
+	customKeyMap.MultiSelect.Next = key.NewBinding(
+		key.WithKeys("tab"),
+		key.WithHelp("tab", "next field"),
+	)
+
+	// Prompt user to select resources
+	var selectedResourceIDs []string
+	form := huh.NewForm(
+		huh.NewGroup(
+			huh.NewMultiSelect[string]().
+				Title("Select resources for your application").
+				Description("Use space/enter to select, 'n' to continue").
+				Options(options...).
+				Value(&selectedResourceIDs),
+		),
+	).WithKeyMap(customKeyMap)
+
+	if err := form.Run(); err != nil {
+		return fmt.Errorf("failed to collect resource selection: %w", err)
+	}
+
+	// If no resources selected, just return
+	if len(selectedResourceIDs) == 0 {
+		cobraCmd.Println("No resources selected.")
+		return nil
+	}
+
+	// Save the selected resources
+	cobraCmd.Printf("Saving %d selected resource(s)...\n", len(selectedResourceIDs))
+	_, err = apiClient.SaveApplicationResources(orgID, appID, selectedResourceIDs)
+	if ok := api.CheckErr(cobraCmd, err); !ok {
+		return err
+	}
+
+	cobraCmd.Printf("✓ Resources configured successfully\n")
+	return nil
+}

cmd/app/helper.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/charmbracelet/huh"
 	"github.com/major-technology/cli/clients/git"
+	mjrToken "github.com/major-technology/cli/clients/token"
 	"github.com/major-technology/cli/singletons"
 	"github.com/major-technology/cli/utils"
 	"github.com/spf13/cobra"
@@ -163,24 +164,60 @@ func testGitAccess(repoURL string) bool {
 // ensureRepositoryAccess ensures the user has access to the repository by inviting them as a collaborator
 // This function prompts for GitHub username, sends an invite, and waits for access to be granted
 func ensureRepositoryAccess(cmd *cobra.Command, appID string, sshURL string, httpsURL string) error {
-	// Prompt for GitHub username
+	// Check if GitHub username is stored in keychain
+	storedUsername, err := mjrToken.GetGithubUsername()
+	if err != nil {
+		return fmt.Errorf("failed to check stored GitHub username: %w", err)
+	}
+
 	var githubUsername string
-	form := huh.NewForm(
-		huh.NewGroup(
-			huh.NewInput().
-				Title("What is your GitHub username?").
-				Value(&githubUsername).
-				Validate(func(s string) error {
-					if s == "" {
-						return fmt.Errorf("GitHub username is required")
-					}
-					return nil
-				}),
-		),
-	)
-
-	if err := form.Run(); err != nil {
-		return fmt.Errorf("failed to get GitHub username: %w", err)
+	
+	// If we have a stored username, confirm with the user
+	if storedUsername != "" {
+		var useStored bool
+		confirmForm := huh.NewForm(
+			huh.NewGroup(
+				huh.NewConfirm().
+					Title(fmt.Sprintf("Use GitHub username: %s?", storedUsername)).
+					Description("We have your GitHub username saved. Would you like to use it?").
+					Value(&useStored),
+			),
+		)
+
+		if err := confirmForm.Run(); err != nil {
+			return fmt.Errorf("failed to confirm GitHub username: %w", err)
+		}
+
+		if useStored {
+			githubUsername = storedUsername
+		}
+	}
+
+	// If no stored username or user declined to use it, prompt for username
+	if githubUsername == "" {
+		form := huh.NewForm(
+			huh.NewGroup(
+				huh.NewInput().
+					Title("What is your GitHub username?").
+					Value(&githubUsername).
+					Validate(func(s string) error {
+						if s == "" {
+							return fmt.Errorf("GitHub username is required")
+						}
+						return nil
+					}),
+			),
+		)
+
+		if err := form.Run(); err != nil {
+			return fmt.Errorf("failed to get GitHub username: %w", err)
+		}
+
+		// Store the username for future use
+		if err := mjrToken.StoreGithubUsername(githubUsername); err != nil {
+			// Log the error but don't fail the operation
+			cmd.Printf("Warning: Failed to save GitHub username: %v\n", err)
+		}
 	}
 
 	cmd.Printf("\nAdding @%s as a collaborator to the repository...\n", githubUsername)
@@ -192,7 +229,7 @@ func ensureRepositoryAccess(cmd *cobra.Command, appID string, sshURL string, htt
 	}
 
 	// Add user as GitHub collaborator
-	_, err := apiClient.AddGithubCollaborators(appID, githubUsername)
+	_, err = apiClient.AddGithubCollaborators(appID, githubUsername)
 	if err != nil {
 		return fmt.Errorf("failed to add GitHub collaborator: %w", err)
 	}

cmd/git/config.go

@@ -0,0 +1,63 @@
+package git
+
+import (
+	"fmt"
+
+	"github.com/charmbracelet/huh"
+	mjrToken "github.com/major-technology/cli/clients/token"
+	"github.com/spf13/cobra"
+)
+
+// configCmd represents the git config command
+var configCmd = &cobra.Command{
+	Use:   "config",
+	Short: "Configure git settings",
+	Long:  `Configure git-related settings such as your GitHub username.`,
+	Run: func(cobraCmd *cobra.Command, args []string) {
+		cobra.CheckErr(runConfig(cobraCmd))
+	},
+}
+
+func runConfig(cobraCmd *cobra.Command) error {
+	// Get current GitHub username if it exists
+	currentUsername, err := mjrToken.GetGithubUsername()
+	if err != nil {
+		return fmt.Errorf("failed to get current GitHub username: %w", err)
+	}
+
+	// Show current username if it exists
+	if currentUsername != "" {
+		cobraCmd.Printf("Current GitHub username: %s\n\n", currentUsername)
+	}
+
+	// Prompt for new GitHub username
+	var githubUsername string
+	form := huh.NewForm(
+		huh.NewGroup(
+			huh.NewInput().
+				Title("GitHub Username").
+				Description("Enter your GitHub username").
+				Value(&githubUsername).
+				Placeholder(currentUsername).
+				Validate(func(s string) error {
+					if s == "" {
+						return fmt.Errorf("GitHub username is required")
+					}
+					return nil
+				}),
+		),
+	)
+
+	if err := form.Run(); err != nil {
+		return fmt.Errorf("failed to collect GitHub username: %w", err)
+	}
+
+	// Store the GitHub username
+	if err := mjrToken.StoreGithubUsername(githubUsername); err != nil {
+		return fmt.Errorf("failed to store GitHub username: %w", err)
+	}
+
+	cobraCmd.Printf("✓ GitHub username saved: %s\n", githubUsername)
+	return nil
+}
+