Fix diagnostic messages on update environment

pulumi · Dec 12, 2024 · 0136bbb · 0136bbb
1 parent 0a8fc41
commit 0136bbb
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
@@ -1,7 +1,7 @@
 ### Improvements
 
-- Add `--definition` flag to `esc env get` to output definition
-  [#416](https://github.com/pulumi/esc/pull/416)
+- Fix diagnostic messages when updating environment with invalid definition
+  [#422](https://github.com/pulumi/esc/pull/422)
 
 ### Bug Fixes
 

diff --git a/cmd/esc/cli/client/client.go b/cmd/esc/cli/client/client.go
@@ -560,7 +560,7 @@ func (pc *client) UpdateEnvironmentWithRevision(
 	})
 	if err != nil {
 		var diags *EnvironmentErrorResponse
-		if errors.As(err, &diags) && diags.Code == http.StatusBadRequest && len(diags.Diagnostics) != 0 {
+		if errors.As(err, &diags) && len(diags.Diagnostics) != 0 {
 			return diags.Diagnostics, 0, nil
 		}
 		return nil, 0, err

diff --git a/cmd/esc/cli/client/client_test.go b/cmd/esc/cli/client/client_test.go
@@ -339,6 +339,39 @@ func TestUpdateEnvironment(t *testing.T) {
 		assert.Equal(t, expected, diags)
 	})
 
+	t.Run("Diags only", func(t *testing.T) {
+		expected := []EnvironmentDiagnostic{
+			{
+				Range: &esc.Range{
+					Environment: "test-env",
+					Begin:       esc.Pos{Line: 42, Column: 1},
+					End:         esc.Pos{Line: 42, Column: 42},
+				},
+				Summary: "diag 1",
+			},
+			{
+				Range: &esc.Range{
+					Environment: "import-env",
+					Begin:       esc.Pos{Line: 1, Column: 2},
+					End:         esc.Pos{Line: 3, Column: 4},
+				},
+				Summary: "diag 2",
+			},
+		}
+
+		client := newTestClient(t, http.MethodPatch, "/api/esc/environments/test-org/test-project/test-env", func(w http.ResponseWriter, r *http.Request) {
+			w.WriteHeader(http.StatusBadRequest)
+
+			err := json.NewEncoder(w).Encode(EnvironmentErrorResponse{Diagnostics: expected})
+			require.NoError(t, err)
+		})
+
+		diags, revision, err := client.UpdateEnvironmentWithRevision(context.Background(), "test-org", "test-project", "test-env", nil, "")
+		require.Equal(t, 0, revision)
+		require.NoError(t, err)
+		assert.Equal(t, expected, diags)
+	})
+
 	t.Run("Conflict", func(t *testing.T) {
 		client := newTestClient(t, http.MethodPatch, "/api/esc/environments/test-org/test-project/test-env", func(w http.ResponseWriter, r *http.Request) {
 			w.WriteHeader(http.StatusConflict)