From 86c8ac093fe4c8f076be8812816dd3870e051962 Mon Sep 17 00:00:00 2001
From: Szymon Dziedzic <szymon.dziedzic@swmansion.com>
Date: Fri, 10 Jan 2025 11:03:52 +0100
Subject: [PATCH] [ENG-14643][eas-cli] make automatic env resolution message
 shorter (#2806)

* [eas-cli] make automatic env resolution message shorter

* add changelog entry
---
 CHANGELOG.md                                  |  2 +
 .../build/evaluateConfigWithEnvVarsAsync.ts   | 39 ++++++++-----------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cacd3ae82d..6bafc49770 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🧹 Chores
 
+- Make automatic env resolution message shorter. ([#2806](https://github.com/expo/eas-cli/pull/2806) by [@szdziedzic](https://github.com/szdziedzic))
+
 ## [14.4.0](https://github.com/expo/eas-cli/releases/tag/v14.4.0) - 2025-01-09
 
 ### 🎉 New features
diff --git a/packages/eas-cli/src/build/evaluateConfigWithEnvVarsAsync.ts b/packages/eas-cli/src/build/evaluateConfigWithEnvVarsAsync.ts
index c8ea2d677a..996a08d761 100644
--- a/packages/eas-cli/src/build/evaluateConfigWithEnvVarsAsync.ts
+++ b/packages/eas-cli/src/build/evaluateConfigWithEnvVarsAsync.ts
@@ -84,13 +84,13 @@ async function resolveEnvVarsAsync({
 
     if (Object.keys(serverEnvVars).length > 0) {
       Log.log(
-        `Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS servers: ${Object.keys(
+        `Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS: ${Object.keys(
           serverEnvVars
         ).join(', ')}.`
       );
     } else {
       Log.log(
-        `No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS servers.`
+        `No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS.`
       );
     }
 
@@ -112,7 +112,7 @@ async function resolveEnvVarsAsync({
       );
       if (overlappingKeys.length > 0) {
         Log.warn(
-          `The following environment variables are defined in both the "${buildProfileName}" build profile "env" configuration and the "${environment.toLowerCase()}" environment on EAS servers: ${overlappingKeys.join(
+          `The following environment variables are defined in both the "${buildProfileName}" build profile "env" configuration and the "${environment.toLowerCase()}" environment on EAS: ${overlappingKeys.join(
             ', '
           )}. The values from the build profile configuration will be used.`
         );
@@ -135,23 +135,18 @@ async function resolveEnvVarsAsync({
 function resolveSuggestedEnvironmentForBuildProfileConfiguration(
   buildProfile: BuildProfile
 ): EnvironmentVariableEnvironment {
-  const setEnvironmentMessage =
-    'Set the "environment" field in the build profile if you want to specify the environment manually.';
-  if (buildProfile.distribution === 'store') {
-    Log.log(
-      `We detected that you are building for the "store" distribution. Resolving the environment for environment variables used during the build to "production". ${setEnvironmentMessage}`
-    );
-    return EnvironmentVariableEnvironment.Production;
-  } else {
-    if (buildProfile.developmentClient) {
-      Log.log(
-        `We detected that you are building the development client. Resolving the environment for environment variables used during the build to "development". ${setEnvironmentMessage}`
-      );
-      return EnvironmentVariableEnvironment.Development;
-    }
-    Log.log(
-      `We detected that you are building for the "internal" distribution. Resolving the environment for environment variables used during the build to "preview". ${setEnvironmentMessage}`
-    );
-    return EnvironmentVariableEnvironment.Preview;
-  }
+  const environment =
+    buildProfile.distribution === 'store'
+      ? EnvironmentVariableEnvironment.Production
+      : buildProfile.developmentClient
+        ? EnvironmentVariableEnvironment.Development
+        : EnvironmentVariableEnvironment.Preview;
+
+  Log.log(
+    `Resolved "${environment.toLowerCase()}" environment for the build. ${learnMore(
+      'https://docs.expo.dev/eas/environment-variables/#setting-the-environment-for-your-builds'
+    )}`
+  );
+
+  return environment;
 }