add unset test

f0ssel · f0ssel · commit 6bcc688f0ad9 · 2024-01-02T18:23:17.000Z
diff --git a/cli/templateedit.go b/cli/templateedit.go
@@ -342,6 +342,14 @@ func updateTemplateMetaRequest(args updateTemplateMetaArgs) codersdk.UpdateTempl
 	if args.unsetAutostopRequirementDaysOfWeek {
 		args.autostopRequirementDaysOfWeek = []string{}
 	}
+	unsetDefaultTTL, err := time.ParseDuration("24h")
+	if err != nil {
+		panic(err)
+	}
+
+	if args.defaultTTL == unsetDefaultTTL {
+		args.defaultTTL = time.Duration(args.template.DefaultTTLMillis) * time.Millisecond
+	}
 	if args.failureTTL == 0 {
 		args.failureTTL = time.Duration(args.template.FailureTTLMillis) * time.Millisecond
 	}
diff --git a/cli/templatepush_test.go b/cli/templatepush_test.go
@@ -787,6 +787,77 @@ func TestTemplatePush(t *testing.T) {
 		assert.Equal(t, defaultTTL.Milliseconds(), updated.DefaultTTLMillis)
 		assert.Equal(t, allowUserCancelWorkspaceJobs, updated.AllowUserCancelWorkspaceJobs)
 	})
+
+	t.Run("EditMetadataKeepUnsetUnchanged", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
+		owner := coderdtest.CreateFirstUser(t, client)
+		templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.RoleTemplateAdmin())
+		version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, nil)
+		_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
+
+		template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID)
+
+		// Test the cli command.
+		source := clitest.CreateTemplateVersionSource(t, &echo.Responses{
+			Parse:          echo.ParseComplete,
+			ProvisionApply: echo.ApplyComplete,
+		})
+
+		desc := "lorem ipsum dolor sit amet et cetera"
+
+		inv, root := clitest.New(t,
+			"templates",
+			"push",
+			template.Name,
+			"--directory", source,
+			"--test.provisioner", string(database.ProvisionerTypeEcho),
+			"--description", desc,
+		)
+		clitest.SetupConfig(t, templateAdmin, root)
+		pty := ptytest.New(t).Attach(inv)
+
+		execDone := make(chan error)
+		go func() {
+			execDone <- inv.Run()
+		}()
+
+		matches := []struct {
+			match string
+			write string
+		}{
+			{match: "Upload", write: "yes"},
+		}
+		for _, m := range matches {
+			pty.ExpectMatch(m.match)
+			pty.WriteLine(m.write)
+		}
+
+		require.NoError(t, <-execDone)
+
+		// Assert that the template version changed.
+		templateVersions, err := client.TemplateVersionsByTemplate(context.Background(), codersdk.TemplateVersionsByTemplateRequest{
+			TemplateID: template.ID,
+		})
+		require.NoError(t, err)
+		assert.Len(t, templateVersions, 2)
+		assert.NotEqual(t, template.ActiveVersionID, templateVersions[1].ID)
+
+		// Assert that the template metadata changed.
+		updated, err := client.Template(context.Background(), template.ID)
+		require.NoError(t, err)
+		assert.Equal(t, template.Name, updated.Name)
+		assert.Equal(t, template.DisplayName, updated.DisplayName)
+		assert.Equal(t, desc, updated.Description)
+		assert.Equal(t, template.Icon, updated.Icon)
+		assert.Equal(t, template.DefaultTTLMillis, updated.DefaultTTLMillis)
+		assert.Equal(t, template.FailureTTLMillis, updated.FailureTTLMillis)
+		assert.Equal(t, template.TimeTilDormantAutoDeleteMillis, updated.TimeTilDormantAutoDeleteMillis)
+		assert.Equal(t, template.AutostartRequirement.DaysOfWeek, updated.AutostartRequirement.DaysOfWeek)
+		assert.Equal(t, template.AutostopRequirement.DaysOfWeek, updated.AutostopRequirement.DaysOfWeek)
+		assert.Equal(t, template.RequireActiveVersion, updated.RequireActiveVersion)
+		assert.Equal(t, template.AllowUserCancelWorkspaceJobs, updated.AllowUserCancelWorkspaceJobs)
+	})
 }
 
 func createEchoResponsesWithTemplateVariables(templateVariables []*proto.TemplateVariable) *echo.Responses {
