Dec 11, 2023 · Dec 8, 2023 · Dec 8, 2023
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
 Valid:  true,
 }
 }
 var env pqtype.NullRawMessage
 if prAgent.Env != nil {
 data, err := json.Marshal(prAgent.Env)

 env := make(map[string]string)
 // For now, we only support adding extra envs, not overriding
 // existing ones or performing other manipulations. In future
 // we may write these to a separate table so we can perform
 // conditional logic on the agent.
 for _, e := range prAgent.ExtraEnvs {
 env[e.Name] = e.Value
 }
 // Allow the agent defined envs to override extra envs.
 for k, v := range prAgent.Env {
 env[k] = v
 }

 var envJSON pqtype.NullRawMessage
 if len(env) > 0 {
 data, err := json.Marshal(env)
 if err != nil {
 return xerrors.Errorf("marshal env: %w", err)
 }
 env = pqtype.NullRawMessage{
 envJSON = pqtype.NullRawMessage{
 RawMessage: data,
 Valid:      true,
 }
 AuthToken:                authToken,
 AuthInstanceID:           instanceID,
 Architecture:             prAgent.Architecture,
 EnvironmentVariables:env,
 EnvironmentVariables:envJSON,
 Directory:                prAgent.Directory,
 OperatingSystem:          prAgent.OperatingSystem,
 ConnectionTimeoutSeconds: prAgent.GetConnectionTimeoutSeconds(),
diff --git a/coderd/provisionerdserver/provisionerdserver_test.go b/coderd/provisionerdserver/provisionerdserver_test.go
 Apps: []*sdkproto.App{{
 Slug: "a",
 }},
 ExtraEnvs: []*sdkproto.Env{
 {
 Name:  "something", // Duplicate, already set by Env.
 Value: "I should be discarded!",
 },
 {
 Name:  "else",
 Value: "I laugh in the face of danger.",
 },
 },
 Scripts: []*sdkproto.Script{{
 DisplayName: "Startup",
 Icon:        "/test.png",
 require.Equal(t, "linux", agent.OperatingSystem)
 want, err := json.Marshal(map[string]string{
 "something": "test",
 "else":      "I laugh in the face of danger.",
 })
 require.NoError(t, err)
 got, err := agent.EnvironmentVariables.RawMessage.MarshalJSON()
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
 Healthcheck []appHealthcheckAttributes `mapstructure:"healthcheck"`
 }

 type agentEnvAttributes struct {
 AgentID string `mapstructure:"agent_id"`
 Name    string `mapstructure:"name"`
 Value   string `mapstructure:"value"`
 }

 type agentScriptAttributes struct {
 AgentID          string `mapstructure:"agent_id"`
 DisplayName      string `mapstructure:"display_name"`
 }
 }

 // Associate envs with agents.
 for _, resources := range tfResourcesByLabel {
 for _, resource := range resources {
 if resource.Type != "coder_env" {
 continue
 }
 var attrs agentEnvAttributes
 err = mapstructure.Decode(resource.AttributeValues, &attrs)
 if err != nil {
 return nil, xerrors.Errorf("decode env attributes: %w", err)
 }
 for _, agents := range resourceAgents {
 for _, agent := range agents {
 // Find agents with the matching ID and associate them!
 if agent.Id != attrs.AgentID {
 continue
 }
 agent.ExtraEnvs = append(agent.ExtraEnvs, &proto.Env{
 Name:  attrs.Name,
 Value: attrs.Value,
 })
 }
 }
 }
 }

 // Associate scripts with agents.
 for _, resources := range tfResourcesByLabel {
 for _, resource := range resources {
 var attrs agentScriptAttributes
 err = mapstructure.Decode(resource.AttributeValues, &attrs)
 if err != nil {
 return nil, xerrors.Errorf("decodeapp attributes: %w", err)
 return nil, xerrors.Errorf("decodescript attributes: %w", err)
 }
 for _, agents := range resourceAgents {
 for _, agent := range agents {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1387,13 +1387,27 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
		Valid: true,
		}
		}
		var env pqtype.NullRawMessage
		if prAgent.Env != nil {
		data, err := json.Marshal(prAgent.Env)

		env := make(map[string]string)
		// For now, we only support adding extra envs, not overriding
mafredri marked this conversation as resolved. Show resolvedHide resolved
		// existing ones or performing other manipulations. In future
		// we may write these to a separate table so we can perform
		// conditional logic on the agent.
		for _, e := range prAgent.ExtraEnvs {
		env[e.Name] = e.Value
		}
		// Allow the agent defined envs to override extra envs.
		for k, v := range prAgent.Env {
		env[k] = v
		}

		var envJSON pqtype.NullRawMessage
		if len(env) > 0 {
		data, err := json.Marshal(env)
		if err != nil {
		return xerrors.Errorf("marshal env: %w", err)
		}
		env = pqtype.NullRawMessage{
		envJSON = pqtype.NullRawMessage{
		RawMessage: data,
		Valid: true,
		}
Expand All		@@ -1416,7 +1430,7 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
		AuthToken: authToken,
		AuthInstanceID: instanceID,
		Architecture: prAgent.Architecture,
		EnvironmentVariables:env,
		EnvironmentVariables:envJSON,
		Directory: prAgent.Directory,
		OperatingSystem: prAgent.OperatingSystem,
		ConnectionTimeoutSeconds: prAgent.GetConnectionTimeoutSeconds(),
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1585,6 +1585,16 @@ func TestInsertWorkspaceResource(t *testing.T) {
		Apps: []*sdkproto.App{{
		Slug: "a",
		}},
		ExtraEnvs: []*sdkproto.Env{
		{
		Name: "something", // Duplicate, already set by Env.
		Value: "I should be discarded!",
		},
		{
		Name: "else",
		Value: "I laugh in the face of danger.",
		},
		},
		Scripts: []*sdkproto.Script{{
		DisplayName: "Startup",
		Icon: "/test.png",
Expand All		@@ -1609,6 +1619,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
		require.Equal(t, "linux", agent.OperatingSystem)
		want, err := json.Marshal(map[string]string{
		"something": "test",
		"else": "I laugh in the face of danger.",
		})
		require.NoError(t, err)
		got, err := agent.EnvironmentVariables.RawMessage.MarshalJSON()
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -77,6 +77,12 @@ type agentAppAttributes struct {
		Healthcheck []appHealthcheckAttributes `mapstructure:"healthcheck"`
		}

		type agentEnvAttributes struct {
		AgentID string `mapstructure:"agent_id"`
		Name string `mapstructure:"name"`
		Value string `mapstructure:"value"`
		}

		type agentScriptAttributes struct {
		AgentID string `mapstructure:"agent_id"`
		DisplayName string `mapstructure:"display_name"`
Expand DownExpand Up		@@ -435,6 +441,32 @@ func ConvertState(modules []tfjson.StateModule, rawGraph string) (State, error
		}
		}

		// Associate envs with agents.
		for _, resources := range tfResourcesByLabel {
		for _, resource := range resources {
		if resource.Type != "coder_env" {
		continue
		}
		var attrs agentEnvAttributes
		err = mapstructure.Decode(resource.AttributeValues, &attrs)
		if err != nil {
		return nil, xerrors.Errorf("decode env attributes: %w", err)
		}
		for _, agents := range resourceAgents {
		for _, agent := range agents {
		// Find agents with the matching ID and associate them!
		if agent.Id != attrs.AgentID {
		continue
		}
		agent.ExtraEnvs = append(agent.ExtraEnvs, &proto.Env{
		Name: attrs.Name,
		Value: attrs.Value,
		})
		}
		}
		}
		}

		// Associate scripts with agents.
		for _, resources := range tfResourcesByLabel {
		for _, resource := range resources {
Expand All		@@ -444,7 +476,7 @@ func ConvertState(modules []tfjson.StateModule, rawGraph string) (State, error
		var attrs agentScriptAttributes
		err = mapstructure.Decode(resource.AttributeValues, &attrs)
		if err != nil {
		return nil, xerrors.Errorf("decodeapp attributes: %w", err)
		return nil, xerrors.Errorf("decodescript attributes: %w", err)
		}
		for _, agents := range resourceAgents {
		for _, agent := range agents {
Expand Down