rename timeoutDestroySeconds → destroyTimeoutSeconds, --timeout → --destroy-timeout-seconds

Author: gluonfield

cmd/deploy.go

@@ -59,8 +59,8 @@ func addServiceFlags(cmd *cobra.Command) {
 	if f.Lookup("buildpack") == nil {
 		f.String("buildpack", "railpack", "Build strategy: railpack, dockerfile, static")
 	}
-	if f.Lookup("timeout") == nil {
-		f.Int("timeout", 0, "Auto-destroy after N seconds from deploy completion (0=persistent, max 86400)")
+	if f.Lookup("destroy-timeout-seconds") == nil {
+		f.Int("destroy-timeout-seconds", 0, "Auto-destroy after N seconds from deploy completion (0=persistent, max 86400)")
 	}
 }
 
@@ -203,9 +203,9 @@ func runCreate(cmd *cobra.Command, client graphql.Client, name string) {
 		region, _ := cmd.Flags().GetString("region")
 		input.Regions = []string{region}
 	}
-	if cmd.Flags().Changed("timeout") {
-		v, _ := cmd.Flags().GetInt("timeout")
-		input.TimeoutDestroySeconds = &v
+	if cmd.Flags().Changed("destroy-timeout-seconds") {
+		v, _ := cmd.Flags().GetInt("destroy-timeout-seconds")
+		input.DestroyTimeoutSeconds = &v
 	}
 
 	input.EnvVars = collectEnvVars(cmd)
@@ -291,9 +291,9 @@ func runUpdate(cmd *cobra.Command, client graphql.Client, name string) {
 		v, _ := cmd.Flags().GetInt("port")
 		input.Ports = singlePublicHTTPPort(v)
 	}
-	if cmd.Flags().Changed("timeout") {
-		v, _ := cmd.Flags().GetInt("timeout")
-		input.TimeoutDestroySeconds = &v
+	if cmd.Flags().Changed("destroy-timeout-seconds") {
+		v, _ := cmd.Flags().GetInt("destroy-timeout-seconds")
+		input.DestroyTimeoutSeconds = &v
 	}
 
 	input.EnvVars = collectEnvVars(cmd)

cmd/service_inspect.go

@@ -232,8 +232,8 @@ func renderServiceDetail(svc *gql.FindServiceServiceListServiceConnectionNodesSe
 	}
 	d.kv("Memory", svc.Memory)
 	d.kv("vCPU", svc.Vcpus)
-	if svc.TimeoutDestroySeconds > 0 {
-		d.kv("Auto-destroy", fmt.Sprintf("%ds after deploy", svc.TimeoutDestroySeconds))
+	if svc.DestroyTimeoutSeconds > 0 {
+		d.kv("Auto-destroy", fmt.Sprintf("%ds after deploy", svc.DestroyTimeoutSeconds))
 	}
 	if svc.CustomDomain != nil {
 		status := ""

internal/gql/generated.go

@@ -56,7 +56,7 @@ query FindService($ws: String) {
         internalEndpoint
         publicEndpoint
       }
-      timeoutDestroySeconds
+      destroyTimeoutSeconds
       envVars { key value }
       projectId
       project { slug }

internal/gql/operations.graphql

@@ -29,7 +29,7 @@ const serviceGetQuery = `query($id: ID!) {
     ports { name port protocol visibility internalEndpoint publicEndpoint }
     gitProvider commitHash memory vcpus customDomain customDomainStatus
     buildPack buildCommand startCommand publishDirectory rootDirectory dockerfilePath
-    timeoutDestroySeconds createdAt updatedAt
+    destroyTimeoutSeconds createdAt updatedAt
   }
 }`
 
@@ -41,7 +41,7 @@ const serviceListQuery = `query($ws: String, $proj: String) {
       ports { name port protocol visibility internalEndpoint publicEndpoint }
       gitProvider commitHash memory vcpus customDomain customDomainStatus
       buildPack buildCommand startCommand publishDirectory rootDirectory dockerfilePath
-      timeoutDestroySeconds createdAt updatedAt
+      destroyTimeoutSeconds createdAt updatedAt
     }
   }
 }`

pkg/ink/service.go

@@ -26,7 +26,7 @@ type Service struct {
 	PublishDirectory   string        `json:"publishDirectory"`
 	RootDirectory      string        `json:"rootDirectory"`
 	DockerfilePath        string        `json:"dockerfilePath"`
-	TimeoutDestroySeconds int           `json:"timeoutDestroySeconds"`
+	DestroyTimeoutSeconds int           `json:"destroyTimeoutSeconds"`
 	CreatedAt             string        `json:"createdAt"`
 	UpdatedAt             string        `json:"updatedAt"`
 }
@@ -84,7 +84,7 @@ type CreateServiceInput struct {
 	RootDirectory    string             `json:"rootDirectory,omitempty"`
 	DockerfilePath        string             `json:"dockerfilePath,omitempty"`
 	Volumes               []VolumeSpec       `json:"volumes,omitempty"`
-	TimeoutDestroySeconds int                `json:"timeoutDestroySeconds,omitempty"`
+	DestroyTimeoutSeconds int                `json:"destroyTimeoutSeconds,omitempty"`
 }
 
 // CreateServiceResult is the result of creating a service.
@@ -136,7 +136,7 @@ type UpdateServiceInput struct {
 	RootDirectory    *string            `json:"rootDirectory,omitempty"`
 	DockerfilePath        *string            `json:"dockerfilePath,omitempty"`
 	Volumes               []VolumeSpec       `json:"volumes,omitempty"`
-	TimeoutDestroySeconds *int               `json:"timeoutDestroySeconds,omitempty"`
+	DestroyTimeoutSeconds *int               `json:"destroyTimeoutSeconds,omitempty"`
 }
 
 // UpdateServiceResult is the result of updating a service.

pkg/ink/service_types.go

@@ -737,7 +737,7 @@ input CreateServiceInput {
   """Persistent volumes to attach."""
   volumes: [VolumeInput!]
   """Auto-destroy service after N seconds from deployment completion. 0 or omit for persistent service. Max 86400 (24h)."""
-  timeoutDestroySeconds: Int
+  destroyTimeoutSeconds: Int
 }
 
 type CreateServiceResult {
@@ -775,7 +775,7 @@ input UpdateServiceInput {
   """Persistent volumes to add."""
   volumes: [VolumeInput!]
   """Auto-destroy service after N seconds from deployment completion. 0 for persistent service. Max 86400 (24h)."""
-  timeoutDestroySeconds: Int
+  destroyTimeoutSeconds: Int
 }
 
 input EnvVarInput {
@@ -854,7 +854,7 @@ type Service {
   """Persistent volumes attached to this service."""
   volumes: [VolumeInfo!]!
   """Auto-destroy timeout in seconds. 0 means persistent (no auto-destroy)."""
-  timeoutDestroySeconds: Int!
+  destroyTimeoutSeconds: Int!
   createdAt: Time!
   updatedAt: Time!
 }