add open_in logic

defelmnq · defelmnq · commit bd9d40bb134a · 2024-12-17T01:45:22.000Z
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000279_workspace_app_add_open_in.down.sql b/coderd/database/migrations/000279_workspace_app_add_open_in.down.sql
@@ -0,0 +1 @@
+ALTER TABLE workspace_apps DROP COLUMN open_in;
diff --git a/coderd/database/migrations/000279_workspace_app_add_open_in.up.sql b/coderd/database/migrations/000279_workspace_app_add_open_in.up.sql
@@ -0,0 +1 @@
+ALTER TABLE workspace_apps ADD COLUMN open_in character varying(64) NOT NULL DEFAULT 'slim-window';
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspaceapps.sql b/coderd/database/queries/workspaceapps.sql
@@ -29,10 +29,11 @@ INSERT INTO
         healthcheck_threshold,
         health,
         display_order,
-        hidden
+        hidden,
+        open_in
     )
 VALUES
-    ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17) RETURNING *;
+    ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18) RETURNING *;
 
 -- name: UpdateWorkspaceAppHealthByID :exec
 UPDATE
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -1509,6 +1509,7 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
 					dur := time.Duration(protoAgent.GetConnectionTimeoutSeconds()) * time.Second
 					agentTimeouts[dur] = true
 				}
+
 				err = InsertWorkspaceResource(ctx, db, job.ID, workspaceBuild.Transition, protoResource, telemetrySnapshot)
 				if err != nil {
 					return xerrors.Errorf("insert provisioner job: %w", err)
@@ -2036,6 +2037,7 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 				Health:               health,
 				DisplayOrder:         int32(app.Order),
 				Hidden:               app.Hidden,
+				OpenIn:				  app.OpenIn,
 			})
 			if err != nil {
 				return xerrors.Errorf("insert app: %w", err)
diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go
@@ -750,6 +750,8 @@ func (api *API) workspaceBuildsData(ctx context.Context, workspaceBuilds []datab
 		return workspaceBuildsData{}, err
 	}
 
+	api.Logger.Warn(ctx, "fetched apps", slog.F("apps", apps))
+
 	return workspaceBuildsData{
 		jobs:             jobs,
 		templateVersions: templateVersions,
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -84,7 +84,11 @@ type agentAppAttributes struct {
 	Healthcheck []appHealthcheckAttributes `mapstructure:"healthcheck"`
 	Order       int64                      `mapstructure:"order"`
 	Hidden      bool                       `mapstructure:"hidden"`
+<<<<<<< Updated upstream
 	OpenIn      string                     `mapstructure:"open_in"`
+=======
+	OpenIn string `mapstructure:"open_in"`
+>>>>>>> Stashed changes
 }
 
 type agentEnvAttributes struct {
@@ -386,12 +390,15 @@ func ConvertState(ctx context.Context, modules []*tfjson.StateModule, rawGraph s
 				continue
 			}
 
+
 			var attrs agentAppAttributes
 			err = mapstructure.Decode(resource.AttributeValues, &attrs)
 			if err != nil {
 				return nil, xerrors.Errorf("decode app attributes: %w", err)
 			}
 
+			logger.Warn(ctx, "RESOUUUUURCE : ", slog.F("resource", attrs))
+
 			// Default to the resource name if none is set!
 			if attrs.Slug == "" {
 				attrs.Slug = resource.Name
@@ -453,7 +460,11 @@ func ConvertState(ctx context.Context, modules []*tfjson.StateModule, rawGraph s
 						Healthcheck:  healthcheck,
 						Order:        attrs.Order,
 						Hidden:       attrs.Hidden,
+<<<<<<< Updated upstream
 						OpenIn:       attrs.OpenIn,
+=======
+						OpenIn: 	  attrs.OpenIn,
+>>>>>>> Stashed changes
 					})
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ALTER TABLE workspace_apps DROP COLUMN open_in;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ALTER TABLE workspace_apps ADD COLUMN open_in character varying(64) NOT NULL DEFAULT 'slim-window';`
Original file line number	Diff line number	Diff line change
`@@ -750,6 +750,8 @@ func (api *API) workspaceBuildsData(ctx context.Context, workspaceBuilds []datab`
`750`	`750`	`return workspaceBuildsData{}, err`
`751`	`751`	`}`
`752`	`752`
	`753`	`+ api.Logger.Warn(ctx, "fetched apps", slog.F("apps", apps))`
	`754`	`+`
`753`	`755`	`return workspaceBuildsData{`
`754`	`756`	`jobs: jobs,`
`755`	`757`	`templateVersions: templateVersions,`