Merge branch 'main' into pyadagiri/ha

Author: pyadagiri-do

Makefile

@@ -149,8 +149,8 @@ upgrade_godo: _upgrade_godo vendor mocks
 vendor:
 	@echo "==> vendor dependencies"
 	@echo ""
-	go mod vendor
 	go mod tidy
+	go mod vendor
 
 .PHONY: clean
 clean:

args.go

@@ -48,6 +48,10 @@ const (
 	ArgAppJobName = "job-name"
 	// ArgAppJobInvocation is the job invocation ID.
 	ArgAppJobInvocation = "job-invocation"
+	// ArgAppEventID is the event ID.
+	ArgAppEventID = "event-id"
+	// ArgAppEventType is the event type filter.
+	ArgAppEventType = "event-type"
 	// ArgAppInstanceName is the instance name of currently running instances (optional).
 	ArgAppInstanceName = "instance-name"
 	// ArgAppDevConfig is the path to the app dev link config.
@@ -161,6 +165,14 @@ const (
 	ArgEnableNvidiaGpuDevicePlugin = "enable-nvidia-gpu-device-plugin"
 	// ArgEnableRDMASharedDevicePlugin enables automatic NVIDIA gpu device plugin installation.
 	ArgEnableRDMASharedDevicePlugin = "enable-rdma-shared-device-plugin"
+	// ArgKubernetesEnableSSO enables SSO as a method of authentication for the DOKS cluster.
+	ArgKubernetesEnableSSO = "sso-enabled"
+	// ArgKubernetesRequireSSO requires SSO as the only method of authentication for the DOKS cluster.
+	ArgKubernetesRequireSSO = "sso-required"
+	// ArgKubernetesSSOIssuerURL is the OIDC issuer URL for cluster SSO configuration.
+	ArgKubernetesSSOIssuerURL = "sso-issuer-url"
+	// ArgKubernetesSSOClientID is the OIDC client ID for cluster SSO configuration.
+	ArgKubernetesSSOClientID = "sso-client-id"
 	// ArgSurgeUpgrade is a cluster's surge-upgrade argument.
 	ArgSurgeUpgrade = "surge-upgrade"
 	// ArgCommandUpsert is an upsert for a resource to be created or updated argument.
@@ -185,6 +197,8 @@ const (
 	ArgKubernetesAlias = "alias"
 	// ArgKubeConfigExpirySeconds indicates the length of time the token in a kubeconfig will be valid in seconds.
 	ArgKubeConfigExpirySeconds = "expiry-seconds"
+	// ArgKubeConfigType selects the kubeconfig authentication mechanism: token, sso, or unset for the API default.
+	ArgKubeConfigType = "type"
 	// ArgImage is an image argument.
 	ArgImage = "image"
 	// ArgImageID is an image id argument.
@@ -221,6 +235,8 @@ const (
 	ArgIPv6 = "enable-ipv6"
 	// ArgPrivateNetworking is an enable private networking argument.
 	ArgPrivateNetworking = "enable-private-networking"
+	// ArgPublicNetworking is an enable public networking argument.
+	ArgPublicNetworking = "enable-public-networking"
 	// ArgMonitoring is an enable monitoring argument.
 	ArgMonitoring = "enable-monitoring"
 	// ArgDropletAgent is an argument for enabling/disabling the Droplet agent.
@@ -713,6 +729,9 @@ const (
 	// ArgTags are the tags applied to the agent.
 	ArgTags = "tags"
 
+	// ArgWorkspaceUuid is the UUID of the workspace the agent belongs to.
+	ArgWorkspaceUuid = "workspace-uuid"
+
 	// ArgAgentForce forces agent deletion without confirmation.
 	ArgAgentForce = "force"
 
@@ -835,4 +854,24 @@ const (
 
 	// ArgOpenAIKeyAPIKey is the API key for the OpenAI API Key
 	ArgOpenAIKeyAPIKey = "api-key"
+
+	// Dedicated Inference Args
+
+	// ArgDedicatedInferenceSpec is the path to a dedicated inference spec file.
+	ArgDedicatedInferenceSpec = "spec"
+
+	// ArgDedicatedInferenceHuggingFaceToken is the Hugging Face token (optional).
+	ArgDedicatedInferenceHuggingFaceToken = "hugging-face-token"
+
+	// ArgDedicatedInferenceAcceleratorSlug filters accelerators by slug (optional).
+	ArgDedicatedInferenceAcceleratorSlug = "slug"
+
+	// ArgDedicatedInferenceRegion filters dedicated inferences by region (optional).
+	ArgDedicatedInferenceRegion = "region"
+
+	// ArgDedicatedInferenceName filters dedicated inferences by name (optional).
+	ArgDedicatedInferenceName = "name"
+
+	// ArgDedicatedInferenceTokenName is the name for a dedicated inference auth token.
+	ArgDedicatedInferenceTokenName = "token-name"
 )

commands/apps.go

@@ -201,8 +201,8 @@ Only basic information is included with the text output format. For complete app
 		displayerType(&displayers.JobInvocations{}),
 	)
 
-	AddStringSliceFlag(listJobInvocations, doctl.ArgAppDeployment, "", []string{}, "The deployment ID to filter job invocations for. If not provided, all job invocations for given app are returned.")
-	AddStringSliceFlag(listJobInvocations, doctl.ArgAppJobName, "", []string{}, "The job name to filter job invocations for. If not provided, all job invocations for given app are returned.")
+	AddStringFlag(listJobInvocations, doctl.ArgAppDeployment, "", "", "The deployment ID to filter job invocations for. If not provided, all job invocations for given app are returned.")
+	AddStringFlag(listJobInvocations, doctl.ArgAppJobName, "", "", "The job name to filter job invocations for. If not provided, all job invocations for given app are returned.")
 
 	listJobInvocations.Example = `The following example retrieves the list of job invocations for the app with the ID ` + "`" + `f81d4fae-7dec-11d0-a765-00a0c91e6bf6` + "`" + ` and the deployment ID ` + "`" + `418b7972-fc67-41ea-ab4b-6f9477c4f7d8` + "`" + ` and the job ` + "`" + `cron` + "`" + `: doctl apps list-job-invocations f81d4fae-7dec-11d0-a765-00a0c91e6bf6 --job-name cron --deployment 418b7972-fc67-41ea-ab4b-6f9477c4f7d8`
 
@@ -232,20 +232,64 @@ Only basic information is included with the text output format. For the complete
 		displayerType(&displayers.JobInvocations{}),
 	)
 
+	listEvents := CmdBuilder(
+		cmd,
+		RunAppsListEvents,
+		"list-events <app id>",
+		"List app events",
+		`Lists all events for the given app, including deployments and autoscaling events.
+
+Only basic information is included with the text output format. For the complete event details, use the `+"`"+`--output`+"`"+` global flag and specify the JSON format.`,
+		Writer,
+		aliasOpt("lse"),
+		displayerType(&displayers.Events{}),
+	)
+	AddStringSliceFlag(listEvents, doctl.ArgAppEventType, "", []string{}, "Filter events by type (e.g. DEPLOYMENT, AUTOSCALING).")
+
+	listEvents.Example = `The following example retrieves the list of events for the app with the ID ` + "`" + `f81d4fae-7dec-11d0-a765-00a0c91e6bf6` + "`" + `: doctl apps list-events f81d4fae-7dec-11d0-a765-00a0c91e6bf6`
+
+	CmdBuilder(
+		cmd,
+		RunAppsCancelEvent,
+		"cancel-event <app id> <event id>",
+		"Cancel an event",
+		`Cancels an in-progress autoscaling event for the given app.
+
+Only basic information is included with the text output format. For the complete event details, use the `+"`"+`--output`+"`"+` global flag and specify the JSON format.`,
+		Writer,
+		aliasOpt("ce"),
+		displayerType(&displayers.Events{}),
+	)
+
+	CmdBuilder(
+		cmd,
+		RunAppsGetEvent,
+		"get-event <app id> <event id>",
+		"Get an event",
+		`Gets a single event for the given app.
+
+Only basic information is included with the text output format. For the complete event details, use the `+"`"+`--output`+"`"+` global flag and specify the JSON format.`,
+		Writer,
+		aliasOpt("ge"),
+		displayerType(&displayers.Events{}),
+	)
+
 	logs := CmdBuilder(
 		cmd,
 		RunAppsGetLogs,
 		"logs <app name or id> <component name (defaults to all components)>",
 		"Retrieves logs",
-		`Retrieves component logs for a deployment or a job invocation of an app.
+		`Retrieves component logs for a deployment, a job invocation, or an autoscaling event of an app.
 
-Three types of logs are supported and can be specified with the --`+doctl.ArgAppLogType+` flag:
+These types of logs are supported and can be specified with the --`+doctl.ArgAppLogType+` flag:
 - build
 - deploy
 - run
 - run_restarted
+- autoscale_event
 
 To retrieve job invocation logs, pass the job invocation ID with the --`+doctl.ArgAppJobInvocation+` flag.
+To retrieve autoscaling event logs, pass the event ID with the --`+doctl.ArgAppEventID+` flag.
 
 For more information about logs, see [How to View Logs](https://www.digitalocean.com/docs/app-platform/how-to/view-logs/).
 `,
@@ -254,6 +298,7 @@ For more information about logs, see [How to View Logs](https://www.digitalocean
 	)
 	AddStringFlag(logs, doctl.ArgAppDeployment, "", "", "Retrieves logs for a specific deployment ID. Defaults to current deployment.")
 	AddStringFlag(logs, doctl.ArgAppJobInvocation, "", "", "Retrieves logs for a specific job invocation ID.")
+	AddStringFlag(logs, doctl.ArgAppEventID, "", "", "Retrieves logs for a specific autoscaling event ID.")
 	AddStringFlag(logs, doctl.ArgAppLogType, "", strings.ToLower(string(godo.AppLogTypeRun)), "Retrieves logs for a specific log type. Defaults to run logs.")
 	AddBoolFlag(logs, doctl.ArgAppLogFollow, "f", false, "Returns logs as they are emitted by the app.")
 	AddIntFlag(logs, doctl.ArgAppLogTail, "", -1, "Specifies the number of lines to show from the end of the log.")
@@ -727,6 +772,11 @@ func RunAppsGetLogs(c *CmdConfig) error {
 		return err
 	}
 
+	eventID, err := c.Doit.GetString(c.NS, doctl.ArgAppEventID)
+	if err != nil {
+		return err
+	}
+
 	_, err = uuid.Parse(appID)
 	if err != nil || deploymentID == "" {
 		app, err := c.Apps().Find(appID)
@@ -736,7 +786,7 @@ func RunAppsGetLogs(c *CmdConfig) error {
 
 		appID = app.ID
 
-		if deploymentID == "" {
+		if deploymentID == "" && eventID == "" {
 			if app.ActiveDeployment != nil {
 				deploymentID = app.ActiveDeployment.ID
 			} else if app.InProgressDeployment != nil {
@@ -761,9 +811,11 @@ func RunAppsGetLogs(c *CmdConfig) error {
 		logType = godo.AppLogTypeRun
 	case strings.ToLower(string(godo.AppLogTypeRunRestarted)):
 		logType = godo.AppLogTypeRunRestarted
+	case strings.ToLower(string(godo.AppLogTypeAutoscaleEvent)):
+		logType = godo.AppLogTypeAutoscaleEvent
 	default:
-		// if jobInvocationID is provided, we can skip the logType validation as logType will be set to JOB_INVOCATION
-		if jobInvocationID == "" {
+		// if jobInvocationID or eventID is provided, we can skip the logType validation
+		if jobInvocationID == "" && eventID == "" {
 			return fmt.Errorf("Invalid log type %s", logTypeStr)
 		}
 	}
@@ -782,7 +834,14 @@ func RunAppsGetLogs(c *CmdConfig) error {
 	}
 
 	var logs *godo.AppLogs
-	if jobInvocationID != "" {
+	if eventID != "" {
+		opts := &godo.GetEventLogsOptions{
+			Follow:    logFollow,
+			TailLines: logTail,
+		}
+
+		logs, err = c.Apps().GetEventLogs(appID, eventID, opts)
+	} else if jobInvocationID != "" {
 		if component == "" {
 			return fmt.Errorf("component name is required when job invocation id is provided")
 		}
@@ -1419,7 +1478,10 @@ func RunAppsListJobInvocations(c *CmdConfig) error {
 
 	opts := &godo.ListJobInvocationsOptions{
 		DeploymentID: deploymentID,
-		JobNames:     []string{jobName},
+	}
+
+	if jobName != "" {
+		opts.JobNames = []string{jobName}
 	}
 
 	invocations, err := c.Apps().ListJobInvocations(appID, opts)
@@ -1483,3 +1545,60 @@ func RunAppsCancelJobInvocation(c *CmdConfig) error {
 
 	return c.Display(displayers.JobInvocations{jobInvocation})
 }
+
+// RunAppsListEvents lists all events for an app.
+func RunAppsListEvents(c *CmdConfig) error {
+	if len(c.Args) < 1 {
+		return doctl.NewMissingArgsErr(c.NS)
+	}
+	appID := c.Args[0]
+
+	eventTypes, err := c.Doit.GetStringSlice(c.NS, doctl.ArgAppEventType)
+	if err != nil {
+		return err
+	}
+
+	opts := &godo.ListEventsOptions{}
+	if len(eventTypes) > 0 {
+		opts.EventTypes = eventTypes
+	}
+
+	events, err := c.Apps().ListEvents(appID, opts)
+	if err != nil {
+		return err
+	}
+
+	return c.Display(displayers.Events(events))
+}
+
+// RunAppsCancelEvent cancels an in-progress autoscaling event.
+func RunAppsCancelEvent(c *CmdConfig) error {
+	if len(c.Args) < 2 {
+		return doctl.NewMissingArgsErr(c.NS)
+	}
+	appID := c.Args[0]
+	eventID := c.Args[1]
+
+	event, err := c.Apps().CancelEvent(appID, eventID)
+	if err != nil {
+		return err
+	}
+
+	return c.Display(displayers.Events{event})
+}
+
+// RunAppsGetEvent retrieves a single event for an app.
+func RunAppsGetEvent(c *CmdConfig) error {
+	if len(c.Args) < 2 {
+		return doctl.NewMissingArgsErr(c.NS)
+	}
+	appID := c.Args[0]
+	eventID := c.Args[1]
+
+	event, err := c.Apps().GetEvent(appID, eventID)
+	if err != nil {
+		return err
+	}
+
+	return c.Display(displayers.Events{event})
+}