add open_in logic

defelmnq · defelmnq · commit 8596e92113e8 · 2024-12-17T01:48:05.000Z
diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go
@@ -750,8 +750,6 @@ 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,11 +84,7 @@ 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 {
@@ -397,8 +393,6 @@ func ConvertState(ctx context.Context, modules []*tfjson.StateModule, rawGraph s
 				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
@@ -460,11 +454,7 @@ 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
`@@ -750,8 +750,6 @@ 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`		`-`
`755`	`753`	`return workspaceBuildsData{`
`756`	`754`	`jobs: jobs,`
`757`	`755`	`templateVersions: templateVersions,`