Merge branch 'farhannawaz/rle-cli' of https://github.com/farhann1/azure-dev into farhannawaz/rle-cli

Farhan Nawaz · Farhan Nawaz · commit 6772f58e719c · 2026-06-24T22:17:05.000+05:30
diff --git a/cli/azd/extensions/azure.ai.rle/internal/cmd/client.go b/cli/azd/extensions/azure.ai.rle/internal/cmd/client.go
@@ -7,6 +7,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -130,6 +131,14 @@ func (e *rleHTTPError) Error() string {
 	return fmt.Sprintf("RLE control plane returned HTTP %d: %s", e.statusCode, strings.TrimSpace(e.body))
 }
 
+// isNotFoundError reports whether err is an RLE control plane error with HTTP 404 status.
+func isNotFoundError(err error) bool {
+	if httpErr, ok := errors.AsType[*rleHTTPError](err); ok {
+		return httpErr.statusCode == http.StatusNotFound
+	}
+	return false
+}
+
 func newRleClient(endpoint string) *rleClient {
 	return &rleClient{
 		baseUrl: strings.TrimRight(endpoint, "/"),
diff --git a/cli/azd/extensions/azure.ai.rle/internal/cmd/deploy.go b/cli/azd/extensions/azure.ai.rle/internal/cmd/deploy.go
@@ -49,6 +49,7 @@ func newDeployCommand() *cobra.Command {
 			if err != nil {
 				return err
 			}
+
 			environmentId := firstNonEmpty(state.EnvironmentId, slug(state.Name))
 			client := newRleClient(resolveControlPlaneEndpoint(""))
 			request := v1EnvironmentRequest{
@@ -62,16 +63,32 @@ func newDeployCommand() *cobra.Command {
 			if !created {
 				action = "Updating"
 			}
+
 			if _, err := fmt.Fprintf(cmd.OutOrStdout(), "Skipping build; using existing image '%s'.\n", image); err != nil {
 				return err
 			}
+
 			if _, err := fmt.Fprintf(cmd.OutOrStdout(), "%s environment '%s' (image=%s) ...\n", action, state.Name, image); err != nil {
 				return err
 			}
 			if state.EnvironmentId == "" {
 				environment, err = client.createV1Environment(cmd.Context(), state.Project, request)
 			} else {
 				environment, err = client.updateV1Environment(cmd.Context(), state.Project, environmentId, request)
+				if isNotFoundError(err) {
+					// The recorded environment no longer exists in the target project
+					// (e.g. the project changed or the control plane was reset). Recreate it.
+					if _, msgErr := fmt.Fprintf(
+						cmd.OutOrStdout(),
+						"Environment '%s' not found in project '%s'; creating a new one.\n",
+						environmentId,
+						state.Project,
+					); msgErr != nil {
+						return msgErr
+					}
+					created = true
+					environment, err = client.createV1Environment(cmd.Context(), state.Project, request)
+				}
 			}
 			if err != nil {
 				return serviceError(err)
