Merge pull request ActiveState#3321 from ActiveState/DX-2784

Update `state eval` to trigger a build

Author: MDrakos

activestate.yaml

@@ -467,3 +467,4 @@ events:
   - name: file-changed
     scope: ["internal/locale/locales"]
     value: build
+config_version: 1

internal/runners/eval/rationalize.go

@@ -22,7 +22,7 @@ func rationalizeError(rerr *error) {
 	switch {
 	case errors.Is(*rerr, rationalize.ErrNotAuthenticated):
 		*rerr = errs.WrapUserFacing(*rerr,
-			locale.T("err_init_authenticated"),
+			locale.Tl("err_eval_not_authenticated", "You need to authenticate to evaluate a target"),
 			errs.SetInput(),
 		)
 

pkg/platform/api/buildplanner/model/buildplan.go

@@ -96,6 +96,7 @@ const (
 	RevertConflictErrorType           = "RevertConflict"
 	CommitNotInTargetHistoryErrorType = "CommitNotInTargetHistory"
 	ComitHasNoParentErrorType         = "CommitHasNoParent"
+	TargetNotFoundErrorType           = "TargetNotFound"
 )
 
 func IsStateToolArtifact(mimeType string) bool {
@@ -416,6 +417,12 @@ func processPlanningError(message string, subErrors []*BuildExprLocation) error
 	}
 
 	for _, se := range subErrors {
+		if se.Type == TargetNotFoundErrorType {
+			return &BuildPlannerError{
+				Err: locale.NewInputError("err_buildplanner_target_not_found", "{{.V0}}", se.Message),
+			}
+		}
+
 		if se.Type != RemediableSolveErrorType && se.Type != GenericSolveErrorType {
 			continue
 		}
@@ -559,7 +566,7 @@ type MergeCommitResult struct {
 }
 
 type BuildTargetResult struct {
-	Project *Project `json:"Project"`
+	Build *Build `json:"buildCommitTarget"`
 	*Error
 	*NotFoundError
 }

pkg/platform/api/buildplanner/request/evaluate.go

@@ -15,56 +15,47 @@ type evaluate struct {
 
 func (b *evaluate) Query() string {
 	return `
-query ($organization: String!, $project: String!, $commitId: String!, $target: String!) {
-  project(organization: $organization, project: $project) {
-    ... on Project {
+mutation ($organization: String!, $project: String!, $commitId: String!, $target: String) {
+  buildCommitTarget(
+    input: {organization: $organization, project: $project, commitId: $commitId, target: $target}
+  ) {
+    ... on Build {
       __typename
-      commit(vcsRef: $commitId) {
-        ... on Commit {
-          __typename
-          build(target: $target) {
-            ... on Build {
-              __typename
-              status
-            }
-            ... on PlanningError {
-              __typename
-              message
-              subErrors {
-                __typename
-                ... on GenericSolveError {
-                  path
-                  message
-                  isTransient
-                  validationErrors {
-                    error
-                    jsonPath
-                  }
-                }
-                ... on RemediableSolveError {
-                  path
-                  message
-                  isTransient
-                  errorType
-                  validationErrors {
-                    error
-                    jsonPath
-                  }
-                  suggestedRemediations {
-                    remediationType
-                    command
-                    parameters
-                  }
-                }
-              }
-            }
+      status
+    }
+    ... on PlanningError {
+      __typename
+      message
+      subErrors {
+        __typename
+        ... on GenericSolveError {
+          buildExprPath
+          message
+          isTransient
+          validationErrors {
+            error
+            jsonPath
+          }
+        }
+        ... on RemediableSolveError {
+          buildExprPath
+          message
+          isTransient
+          errorType
+          validationErrors {
+            error
+            jsonPath
+          }
+          suggestedRemediations {
+            remediationType
+            command
+            parameters
           }
         }
-        ... on NotFound {
-          type
+        ... on TargetNotFound {
           message
-          resource
-          mayNeedAuthentication
+          requestedTarget
+          possibleTargets
         }
       }
     }

pkg/platform/model/buildplanner.go

@@ -687,28 +687,12 @@ func (bp *BuildPlanner) BuildTarget(owner, project, commitID, target string) err
 		return processBuildPlannerError(err, "Failed to evaluate target")
 	}
 
-	if resp.Project == nil {
-		return errs.New("Project is nil")
-	}
-
-	if bpModel.IsErrorResponse(resp.Project.Type) {
-		return bpModel.ProcessProjectError(resp.Project, "Could not evaluate target")
-	}
-
-	if resp.Project.Commit == nil {
-		return errs.New("Commit is nil")
-	}
-
-	if bpModel.IsErrorResponse(resp.Project.Commit.Type) {
-		return bpModel.ProcessCommitError(resp.Project.Commit, "Could not process error response from evaluate target")
-	}
-
-	if resp.Project.Commit.Build == nil {
+	if resp.Build == nil {
 		return errs.New("Build is nil")
 	}
 
-	if bpModel.IsErrorResponse(resp.Project.Commit.Build.Type) {
-		return bpModel.ProcessBuildError(resp.Project.Commit.Build, "Could not process error response from evaluate target")
+	if bpModel.IsErrorResponse(resp.Build.Type) {
+		return bpModel.ProcessBuildError(resp.Build, "Could not process error response from evaluate target")
 	}
 
 	return nil