Nov 25, 2024 · Nov 18, 2024 · Nov 20, 2024 · Nov 20, 2024 · Nov 20, 2024 · Nov 20, 2024
diff --git a/coderd/templateversions.go b/coderd/templateversions.go
 }
 }

 // Ensures the "owner" is properly applied.
 // tags := provisionersdk.MutateTags(apiKey.UserID, req.ProvisionerTags)

 if req.ExampleID != "" && req.FileID != uuid.Nil {
 httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 Message: "You cannot specify both an example_id and a file_id.",
 return
 }

 // Ensure the "owner" tag is properly applied in addition to request tags and coder_workspace_tags.
 // Tag order precedence:
 // 1) User-specified tags in the request
 // 2) Tags parsed from coder_workspace_tags data source in template file
diff --git a/coderd/templateversions_test.go b/coderd/templateversions_test.go
 // TODO(Cian): I'd also like to assert that the correct raw tag values are stored in the database,
 //             but in order to do this, we need to actually run the job! This isn't straightforward right now.

 ctx := testutil.Context(t, testutil.WaitLong)
 store, ps := dbtestutil.NewDB(t)
 client := coderdtest.New(t, &coderdtest.Options{
 Database: store,
 tt := tt
 t.Run(tt.name, func(t *testing.T) {
 t.Parallel()
 ctx := testutil.Context(t, testutil.WaitShort)

 // Create an archive from the files provided in the test case.
 tarFile := testutil.CreateTar(t, tt.files)


 if tt.expectError == "" {
 require.NoError(t, err)

 // Assert the expected provisioner job is created from the template version import
 pj, err := store.GetProvisionerJobByID(ctx, tv.Job.ID)
 require.NoError(t, err)
 require.EqualValues(t, tt.wantTags, pj.Tags)
 } else {
 require.ErrorContains(t, err, tt.expectError)
 }

 })
 }
 })
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1343,9 +1343,6 @@ func (api API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r ht
		}
		}

		// Ensures the "owner" is properly applied.
		// tags := provisionersdk.MutateTags(apiKey.UserID, req.ProvisionerTags)

		if req.ExampleID != "" && req.FileID != uuid.Nil {
		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
		Message: "You cannot specify both an example_id and a file_id.",
Expand DownExpand Up		@@ -1480,6 +1477,7 @@ func (api API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r ht
		return
		}

		// Ensure the "owner" tag is properly applied in addition to request tags and coder_workspace_tags.
		// Tag order precedence:
		// 1) User-specified tags in the request
		// 2) Tags parsed from coder_workspace_tags data source in template file
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -231,7 +231,6 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) {
		// TODO(Cian): I'd also like to assert that the correct raw tag values are stored in the database,
		// but in order to do this, we need to actually run the job! This isn't straightforward right now.

		ctx := testutil.Context(t, testutil.WaitLong)
		store, ps := dbtestutil.NewDB(t)
		client := coderdtest.New(t, &coderdtest.Options{
		Database: store,
Expand DownExpand Up		@@ -434,6 +433,8 @@ data "coder_workspace_tags" "tags" {
		tt := tt
		t.Run(tt.name, func(t *testing.T) {
		t.Parallel()
		ctx := testutil.Context(t, testutil.WaitShort)

		// Create an archive from the files provided in the test case.
		tarFile := testutil.CreateTar(t, tt.files)

Expand All		@@ -453,15 +454,13 @@ data "coder_workspace_tags" "tags" {

		if tt.expectError == "" {
		require.NoError(t, err)

		// Assert the expected provisioner job is created from the template version import
		pj, err := store.GetProvisionerJobByID(ctx, tv.Job.ID)
		require.NoError(t, err)
		require.EqualValues(t, tt.wantTags, pj.Tags)
		} else {
		require.ErrorContains(t, err, tt.expectError)
		}

		})
		}
		})
Expand Down