Release 0.16.2

* use @expo/config to read info about project

* update CHANGELOG.md

.circleci/config.yml

@@ -9,7 +9,7 @@ executors:
     working_directory: ~/turtle
   mac:
     macos: # https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions
-      xcode: '11.1.0'
+      xcode: "11.1.0"
     working_directory: /Users/distiller/project
     shell: /bin/bash -leo pipefail
   android:
@@ -57,8 +57,8 @@ commands:
       - run:
           name: Configure aws-cli
           command: |
-              aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
-              aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
+            aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
+            aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
 
   setup_nix:
     steps:
@@ -141,7 +141,7 @@ commands:
         default: linux
     steps:
       - restore_cache:
-          key: yarn-v2-<< parameters.platform >>-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
+          key: yarn-v3-<< parameters.platform >>-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
 
   save_yarn_cache:
     parameters:
@@ -153,7 +153,7 @@ commands:
         default: linux
     steps:
       - save_cache:
-          key: yarn-v2-<< parameters.platform >>-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
+          key: yarn-v3-<< parameters.platform >>-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
           paths:
             - ~/.cache/yarn # `yarn cache dir`
 

.gitignore

@@ -6,6 +6,7 @@ google-cloud-credentials.json
 /workingdir/*
 /artifacts/*
 .history
+.vscode/
 
 shell.apk
 .secrets*

CHANGELOG.md

@@ -7,6 +7,81 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- Added `--allow-non-https-public-url` to allow bypass of protocol validation on `--public-url`.
+- Added support for dynamic configs (`app.config.ts`, `app.config.js`).
+
+## [0.16.0] - 2020-06-25
+
+### Added
+
+- Added iOS shell app for Expo SDK38.
+- Added Android shell app for SDK 38.
+
+### Removed
+
+- Dropped support for SDK 34.
+
+## [0.15.1] - 2020-06-22
+
+### Changed
+
+- Configure Turtle to use the Redis CA certificate.
+
+### Fixed
+
+- Fix announcing supported SDK versions.
+
+## [0.15.0] - 2020-06-02
+
+### Changed
+
+- Updated `@expo/xdl` to 57.9.13 (added \*.bak files clean-up when building .ipa).
+
+## [0.14.12] - 2020-05-14
+
+### Changed
+
+- Update iOS custom client shell app with various fixes.
+
+## [0.14.11] - 2020-05-04
+
+### Changed
+
+- Update SDK 37 iOS shell app with various fixes.
+
+## [0.14.10] - 2020-05-01
+
+### Added
+
+- support for "android.enableDangerousExperimentalLeanBuilds" in app.json.
+
+## [0.14.9] - 2020-04-21
+
+### Changed
+
+- Updated `@expo/xdl` to 57.8.30 (scoped the build command so it only builds the `:app` Android sub-project and not all the sub-projects available, [PR](https://github.com/expo/expo-cli/pull/1937)).
+
+## [0.14.8] - 2020-04-20
+
+### Changed
+
+- Updated `@expo/xdl` to 57.8.29 (removed call to `check-dynamic-macros-android.sh`, [PR](https://github.com/expo/expo-cli/pull/1933)).
+
+## [0.14.7] - 2020-04-20
+
+### Changed
+
+- Turtle no longer installs all dependencies of shell apps projects — only the production dependencies are installed now.
+- Updated `@expo/xdl` to 57.8.25 (fixed unintuitive `google-services.json` handling for SDK37+, [PR](https://github.com/expo/expo-cli/pull/1897)).
+
+## [0.14.6] - 2020-04-09
+
+### Changed
+
+- Updated @expo/xdl to 57.8.17 (fixed downloading assets smaller than 10 bytes).
+
 ## [0.14.5] - 2020-04-06
 
 ### Changed

Dockerfile

@@ -3,27 +3,26 @@ FROM gcr.io/exponentjs/turtle-android-base:0.4.0
 
 ADD . /app/turtle
 
-RUN mv /app/turtle/workingdir /app && \
-    for SDK_VERSION in `ls /app/workingdir/android/`; do \
-      echo "preparing $SDK_VERSION shell app" && \
-      cd /app/workingdir/android/$SDK_VERSION && \
-      if [ -f universe-package.json ]; then \
-      mv package.json exponent-package.json && \
-      mv universe-package.json package.json && \
-      yarn install && \
-      mv package.json universe-package.json && \
-      mv exponent-package.json package.json; \
-      else \
-      yarn install; \
-      fi \
-    ; done && \
-    mv /app/workingdir /app/turtle
+WORKDIR /app/turtle
+
+RUN ./scripts/fetchRemoteTarballs.sh android
+
+RUN ln -s /app/turtle/workingdir /app/workingdir && \
+  for SDK_VERSION in `ls /app/workingdir/android/`; do \
+  echo "preparing $SDK_VERSION shell app" && \
+  cd /app/workingdir/android/$SDK_VERSION && \
+  mv packages non-workspace-packages && \
+  # Keep in sync with src/bin/setup/android/index.ts#_installNodeModules
+  # --prod requires --ignore-scripts (otherwise
+  # expo-yarn-workspaces errors as missing)
+  yarn install --ignore-scripts --prod && \
+  mv non-workspace-packages packages ; \
+  done
 
 ENV NODE_ENV "production"
 ENV TURTLE_WORKING_DIR_PATH /app/turtle/workingdir/
 
-WORKDIR /app/turtle
-
 ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+ADD redislabs_ca.pem /var/run/config/redislabs-tls/redislabs_ca.pem
 
 CMD ["/usr/bin/supervisord"]

k8s/android/turtle-deployment.template.yml

@@ -152,6 +152,8 @@ spec:
             value: '-Xms2048m -XX:+HeapDumpOnOutOfMemoryError -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC'
           - name: GRADLE_OPTS
             value: '-Dorg.gradle.parallel=true -Dorg.gradle.configureondemand=true -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xms2048m -XX:+HeapDumpOnOutOfMemoryError -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC"'
+          - name: REDIS_CA_CERTIFICATE
+            value: '/var/run/config/redislabs-tls/redislabs_ca.pem'
         resources:
           requests:
             memory: "8192Mi"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.14.5",
+  "version": "0.16.2",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -70,9 +70,11 @@
     "@expo/babel-preset-cli": "^0.1.3",
     "@types/decompress": "^4.2.3",
     "@types/fs-extra": "^5.0.4",
+    "@types/ioredis": "^4.16.6",
     "@types/jest": "^23.3.9",
     "@types/joi": "^13.4.3",
     "@types/lodash": "^4.14.129",
+    "@types/node-forge": "^0.8.6",
     "@types/npm-package-arg": "^6.1.0",
     "@types/progress": "^2.0.1",
     "@types/raven": "^2.5.1",
@@ -99,12 +101,12 @@
     "tslint": "^5.10.0",
     "tslint-eslint-rules": "^5.4.0",
     "ttypescript": "^1.5.6",
-    "typescript": "^3.4.2"
+    "typescript": "^3.9.5"
   },
   "dependencies": {
-    "@expo/config": "^3.0.5",
+    "@expo/config": "^3.2.14",
     "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "57.5.2",
+    "@expo/xdl": "^57.9.13",
     "@google-cloud/logging-bunyan": "^2.0.3",
     "async-retry": "^1.2.1",
     "aws-sdk": "^2.226.1",
@@ -116,7 +118,7 @@
     "decompress": "^4.2.0",
     "dogapi": "^2.8.3",
     "fs-extra": "^6.0.0",
-    "ioredis": "^3.2.2",
+    "ioredis": "^4.17.3",
     "is-semver": "^1.0.8",
     "joi": "^13.2.0",
     "lodash": "^4.17.11",

redislabs_ca.pem

@@ -0,0 +1 @@
+this is just a placeholder to simplify deployments

scripts/build.sh

@@ -14,7 +14,7 @@ PLATFORM=$1
 yarn
 yarn run build
 if [ "$PLATFORM" = "android" ]; then
-  $ROOT_DIR/scripts/android/fetchRemoteAndroidTarball.sh
+  echo "shell apps will be fetched when building a Docker image"
 elif [ "$PLATFORM" = "ios" ]; then
   $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
 fi

shellTarballs/android/sdk34

@@ -1 +0,0 @@
-s3://exp-artifacts/android-shell-builder-a8e204610e5712391336b378f47962bbb0c04164.tar.gz

shellTarballs/android/sdk37

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-701650df1bf19da5e223688a3773a33f6f540fa3.tar.gz
+s3://exp-artifacts/android-shell-builder-3cf3cf0707925322bcd667d5ba79120136f9afd8.tar.gz

shellTarballs/android/sdk38

@@ -0,0 +1 @@
+s3://exp-artifacts/android-shell-builder-076a13fd8b4ee84a59eb6d2777f6db0a2c71fb6d.tar.gz

shellTarballs/ios/client

@@ -1 +1 @@
-s3://exp-artifacts/ios-expo-client-aadfc350d8e4ebf8dce9ce08723bb7e07d563846.tar.gz
+s3://exp-artifacts/ios-expo-client-18a58afe742e63f1d2ac71ba21404d8b84e6563e.tar.gz

shellTarballs/ios/sdk34

@@ -1 +0,0 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-651588ff3445a5d87b3a5b81ec2977c02b22f3a2.tar.gz

shellTarballs/ios/sdk37

@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-549b9da7f764c6b75741aad3cd29a53aba809516.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-30eb0558ff6a77acf56bb045e98b84f6a5e1478a.tar.gz

shellTarballs/ios/sdk38

@@ -0,0 +1 @@
+s3://exp-artifacts/ios-shell-builder-sdk-latest-b0acfb129b4526f771bd0b363f2896b35f007e83.tar.gz

src/__smoke__/fixtures/android/recording.json

@@ -1 +1 @@
-[{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>4372949a-cd3a-5f32-a3de-c39fc958c74a</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","4372949a-cd3a-5f32-a3de-c39fc958c74a","Date","Mon, 06 Apr 2020 10:19:19 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in_priority.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>38544970-726d-5e8f-a908-1e7576054ce7</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","38544970-726d-5e8f-a908-1e7576054ce7","Date","Mon, 06 Apr 2020 10:19:25 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult><Message><MessageId>facd3e34-dbe0-40bb-bdbf-5d6f81c11303</MessageId><ReceiptHandle>AQEBNTZWurF8hlTOBOEyCIKulN/Jv2oAWYh2dk6xARn1Fdv6GXgLyhlYga1kwJ35KBem2Il3zoqGlWubQpILrhhnlbyGXEZdJpONyPwJWzWxCZIR2n+LvccD9vxo3EzOSUjw/HNKBP4RjUdZubrwI0D1rQQvsN6ZWgfZb4IPuPTpTJ7HkGjMPdNFObs52dEEoQKYBFXBT/QVRLxNwB0a9dqDQ1OBIj9oV9KFyneQB2ShUyibsxSTlBsoysX6luCLAX6rmfG5mk1e3FN0kfX5sBcquT2HTM3xX9Fh0Truy/5xY62UbhBsaBN/vdaxPdaZdE+7</ReceiptHandle><MD5OfBody>42e2ec8aba79a37fd6c036904518516a</MD5OfBody><Body>{&quot;id&quot;:&quot;0dc0bb61-db8d-453b-b193-4c4f4c9ebc2f&quot;,&quot;experienceId&quot;:&quot;0128bca1-78cf-4cb8-ac00-c07600500254&quot;,&quot;experienceName&quot;:&quot;@dsokal-local/turtle-cli-example&quot;,&quot;platform&quot;:&quot;android&quot;,&quot;config&quot;:{&quot;releaseChannel&quot;:&quot;default&quot;,&quot;buildType&quot;:&quot;apk&quot;},&quot;status&quot;:&quot;sent-to-queue&quot;,&quot;sdkVersion&quot;:&quot;37.0.0&quot;,&quot;accountId&quot;:&quot;9b473c78-6d0e-4b69-88a8-1c0960287b2f&quot;,&quot;priority&quot;:&quot;normal&quot;,&quot;credentials&quot;:{&quot;keystore&quot;:&quot;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 truncated
+[{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>2f9926f3-9db4-588e-a00a-71f445522996</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","2f9926f3-9db4-588e-a00a-71f445522996","Date","Wed, 08 Apr 2020 13:50:35 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in_priority.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>e42b6179-9846-5d83-9209-367e40aa9c02</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","e42b6179-9846-5d83-9209-367e40aa9c02","Date","Wed, 08 Apr 2020 13:50:41 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult><Message><MessageId>093d5a52-932c-4141-958a-4ee8146dadab</MessageId><ReceiptHandle>AQEBq2BDKWkc+YFuyL+qBVQ6RCqne9ndyzDri6BeHTv+HhCU3kOlINEzzqbgrGJXh49AB6lVInGNsI+uc5uMhC61UscDKfFeqgfhDDUftovz6RXwiIj+xRalgP5fPZn94LbY4KmUoCuGCpXu9UlGxOoorYTkLft9AVY6kabCRlXA8SJzzYjUb1s+rtBoWS3Trj/AOIxOy0EqxeEWpBsNKc1yWc9RNbZ8/qABFLMjOzdmr5gaLEDoRJTUZZUEu9TVOxrC54ES+UaCmgVY17Ubmwo884GbHLoyUA+xqSD0Cvify5GCv3xzB+wjB4gGdGUFdOjj</ReceiptHandle><MD5OfBody>f0cb57fa399d2c8e81f8423e93127bdc</MD5OfBody><Body>{&quot;id&quot;:&quot;1b148a0a-4a5e-4572-b28a-c31aa018351a&quot;,&quot;experienceId&quot;:&quot;0128bca1-78cf-4cb8-ac00-c07600500254&quot;,&quot;experienceName&quot;:&quot;@dsokal-local/turtle-cli-example&quot;,&quot;platform&quot;:&quot;android&quot;,&quot;config&quot;:{&quot;releaseChannel&quot;:&quot;default&quot;,&quot;buildType&quot;:&quot;apk&quot;},&quot;status&quot;:&quot;sent-to-queue&quot;,&quot;sdkVersion&quot;:&quot;37.0.0&quot;,&quot;accountId&quot;:&quot;9b473c78-6d0e-4b69-88a8-1c0960287b2f&quot;,&quot;priority&quot;:&quot;normal&quot;,&quot;credentials&quot;:{&quot;keystore&quot;:&quot;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 truncated

src/__smoke__/fixtures/ios/recording.json

@@ -1 +1 @@
-[{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_ios_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>b5f1eca9-a7d6-53ad-9c14-bbad5d8557b9</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","b5f1eca9-a7d6-53ad-9c14-bbad5d8557b9","Date","Mon, 06 Apr 2020 09:36:24 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_ios_in_priority.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>cf078dc6-ce98-5b15-bdef-dac234c1e80b</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","cf078dc6-ce98-5b15-bdef-dac234c1e80b","Date","Mon, 06 Apr 2020 09:36:30 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_ios_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult><Message><MessageId>f767ca39-904e-41bc-aae6-d2314c524da6</MessageId><ReceiptHandle>AQEBNQC6jpFEVmAFM4AirXD64vMnFlbNSRQYgv/FQMA2hVrLV4cfYCluFPUzMaJL/BKh59+S+UI9MACa+CLVnZwSYLXI5LY3zcSHYsQB1cm2Co/hD5K6kQoZjvtNhJY4eKdb9e9o3ahp7aSnGAb5tp0ixGmjwoQYTwGRO3eFdoJu1X15nh9RGoxYCyUk2ccpLEwlXMIh97q9NJI2qYQzxh5UfSuqrWeWhjhL63/Qk/nxvgeLDQ5g1QA0j4F/i9okIQVCMZcZDja89rf/3p6Q8d+9O6ZNuE3a40W/nObBNqF8zyJgmgjj4O5Q+7UNLS7tuBZm</ReceiptHandle><MD5OfBody>96a69b276272c38cd84a01641bf35ff1</MD5OfBody><Body>{&quot;id&quot;:&quot;eb22c2b4-fa97-40ac-a4ab-f371524223c5&quot;,&quot;experienceId&quot;:&quot;227025fc-a2bf-47fe-8569-d1c23aeeccf6&quot;,&quot;experienceName&quot;:&quot;@dsokal-local/turtle-cli-example&quot;,&quot;platform&quot;:&quot;ios&quot;,&quot;config&quot;:{&quot;releaseChannel&quot;:&quot;default&quot;,&quot;usesNonExemptEncryption&quot;:false,&quot;buildType&quot;:&quot;archive&quot;,&quot;bundleIdentifier&quot;:&quot;com.expo.turtle.cli.example&quot;},&quot;status&quot;:&quot;sent-to-queue&quot;,&quot;sdkVersion&quot;:&quot;37.0.0&quot;,&quot;accountId&quot;:&quot;9b473c78-6d0e-4b69-88a8-1c0960287b2f&quot;,&quot;priority&quot;:&quot;normal&quot;,&quot;credentials&quot;:{&quot;teamId&quot;:&quot;QL76XYH73P&quot;,&quot;teamName&quot;:null,&quot;apnsKeyId&quot;:&quot;QUY2MJ4A7X&quot;,&quot;apnsKeyP8&quot;:&quot;-----BEGIN PRIVATE KEY-----\\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgjVzFvGfxlJPfM3Wq\\nUa1L7D81yjTpGQEM3JIwFdDBfQ+gCgYIKoZIzj0DAQehRANCAASGhxIZHk2tDLzU\\nDWytVMl/TwZvOAeG8TBbWv/5vNpfC8o6/doi50rSCCzOwxoL9/7u3txDoB8chFvV\\nS8a0AwRT\\n-----END PRIVATE KEY-----&quot;,&quot;certP12&quot;:&quot;MIIMkQIBAzCCDFgGCSqGSIb3DQEHAaCCDEkEggxFMIIMQTCCBrcGCSqGSIb3DQEHBqCCBqgwggakAgEAMIIGnQYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQIfpexNY97M8MCAggAgIIGcCEvKC+4Z1kDm7KakEuaUlUYOpXBgiGUh61S+SYA2YWB0uzF5r3JIcvdxnBR96p78CxulLQzK+X8xC5HWSqR5YbbeaPhWQ9ZCqV3bOWSihmz0Ld3cBt9sxds0FOwWeo9XC4t1L6BJsskolO2jXkPY/6In7M3OFsxxR7M8uJdhfzqNJGdRLHWWaOYhQ5sfiObPluM+U0h0otNo3QNjI6EBx0Ra65U1MQWlh9r9pz1UXONWBBy8Np2DNsXrJb7vnLSNNiavfQ09Ahiu8UFH/7G41v8wUAqe1XRO3i+OarC692avplTHA6bfsHmdY2XPUc31Fo2FYpa0AT8lDG5mtlkfy9CawKM9wdKiFaw7/0HgMHuAaRF9pfGsb0yeecx31VPV5FBZ0MRc0xY3oBzSbmDNZaK0EzzwhFk0EPLQc9bHtQg+lYaH8/pNbyueP5mKifoQHaVlwEIrkqUy8eN1fXbugkd6gk05cxNVcF9WmxSax5r4BAlKWV3ISOBJl9YeCUVn2rWqy6w7eWF2QCHZ/IXPU62QZViIsdfB2HtKcWovp9b72ZNc3A7yv+LtqJkR3rutvE2d5LCnEgpztZV3fFYSQadNdixOW0039zhjXpncHJpEyQygT3OvPaPDRbdt35bBAF4TP9n+y3LGzcNUKGoVBekEQ063VEw8W/yWWGltteZO0tFf56Zxp6wXSn0wYGbAXDIkrYA47jgjfH9M4/eaY7nz50QR6X7B4DxhAp+ElInZt9a4x5pcOzHJVYIkfZkW0iDcYUNlCG1KnnmS+pdlV0ucA3PvxtLLDDmOJoGegeCJHpAgKn6ntoyacgNBwT52vj06tDXjWR5k8XCMcQEbtRokJhP2tdESxJoozrhDRoZUGHZUIBNnTen6rPsAdJTih0PDTbfHvXJJUXq23oD/23Tw81yjXQ2fAQDyTQozRQNO9TMwmULo5nuY/PsSCcvSVvSb9DLPkNWjKKiDGGTW5WSym6FBq732uM4XcyBMAUfz+9RMHL0giVA7sLGgQRJGFtry94O+g2SAn81wYdBeF/00DOyNKnzItGgqghz/6lPh07dp/sgm/d1rk+vb+8AMZ7LjpZOFPOluW6ZwQOB3ebptP1IsQvgR2DuDT0f7KHYd3CfOnUc/tSCPvzHGMGQNmca3uI/k5l/emQxL3MqFVD5lfYBP8T4f1RiBbZlm2Zj9IYCqSan3Rjx2Mtvls4IzOhhCW27XSp2B7O3e45KxxiXjLhRA2LxppKC+ofgJW9OHh+IDlO3+r8QMP8UvNbq5j/s9XQuYxl5N2bi51rou0RyOFCWAemkFz8eb5A0Gz87ZFK53uFq8NTb+fPgBUPHixThufe0tCo4Kt2xDq29yP9CemVFOthCtp1t6jjELine truncated
+[{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_ios_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>8bea4e96-2dc5-572c-9898-1991f406b911</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","8bea4e96-2dc5-572c-9898-1991f406b911","Date","Wed, 08 Apr 2020 13:54:16 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_ios_in_priority.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>a995b5e8-7f64-5567-baf9-e2efa6add8fe</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","a995b5e8-7f64-5567-baf9-e2efa6add8fe","Date","Wed, 08 Apr 2020 13:54:22 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_ios_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>8871c5eb-cb40-5a57-a611-92ec128fccd4</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","8871c5eb-cb40-5a57-a611-92ec128fccd4","Date","Wed, 08 Apr 2020 13:54:28 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_ios_in_priority.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>5c49f623-617a-531c-bbf8-a124b8af2bfd</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","5c49f623-617a-531c-bbf8-a124b8af2bfd","Date","Wed, 08 Apr 2020 13:54:34 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_ios_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>68b706ef-2dce-505b-a0d6-51e8f412e6f9</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","68b706ef-2dce-505b-a0d6-51e8f412e6f9","Date","Wed, 08 Apr 2020 13:54:41 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_ios_in_priority.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>c1e6a3e3-8d97-57cd-884c-f4e454757fcd</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","c1e6a3e3-8d97-57cd-884c-f4e454757fcd","Date","Wed, 08 Apr 2020 13:54:47 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_ios_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>a68dea4b-2de4-5000-b718-bd4cf40ca8fa</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","a68dea4b-2de4-5000-b718-bd4cf40ca8fa","Date","Wed, 08 Apr 2020 13:54:53 GMT","Content-Type","text/xml","Content-Length","240"]},{Line truncated

src/__smoke__/smoke.test.ts

@@ -17,8 +17,7 @@ jest.mock('../builders/utils/uploader.ts', () => ({
 async function performSmokeTest(recording: string) {
   jest.setTimeout(60 * 60 * 1000);
 
-  // @ts-ignore
-  const fixtureExists = await fs.exists(recording);
+  const fixtureExists = await fs.pathExists(recording);
   if (fixtureExists) {
     logger.info('Fixture exists, test will use existing one.');
 

src/aws/cloudwatch/index.ts

@@ -136,7 +136,7 @@ function _addEmptyMetrics(metrics: IMetric[]) {
       acc.add(i.MetricName);
     }
     return acc;
-  }, new Set());
+  }, new Set<string>());
 
   const nonEmptyMetrics = _.omitBy(state.registeredMetrics, ({ addEmpty }) => !addEmpty);
   const toAdd = _.difference(Object.keys(nonEmptyMetrics), Array.from(seenMetrics));

src/aws/cloudwatch/statistics.ts

@@ -19,10 +19,10 @@ export default function calculateStatistics(metrics: IMetric[]) {
       });
     }
 
-    result.StatisticValues.Maximum = Math.max(result.StatisticValues.Maximum, i.Value);
-    result.StatisticValues.Minimum = Math.min(result.StatisticValues.Minimum, i.Value);
-    result.StatisticValues.SampleCount += 1;
-    result.StatisticValues.Sum += i.Value;
+    result!.StatisticValues.Maximum = Math.max(result!.StatisticValues.Maximum, i.Value);
+    result!.StatisticValues.Minimum = Math.min(result!.StatisticValues.Minimum, i.Value);
+    result!.StatisticValues.SampleCount += 1;
+    result!.StatisticValues.Sum += i.Value;
     return result;
   }, null);
   return [reduced];

src/bin/commands/build/index.ts

@@ -15,7 +15,12 @@ function setCommonCommandOptions(cmd: any) {
     .option('-o --output <output-file-path>', 'output file path')
     .option(
       '--public-url <url>',
-      'the URL of an externally hosted manifest (for self-hosted apps), only HTTPS URLs are supported!',
+      'the URL of an externally hosted manifest (for self-hosted apps), only HTTPS URLs are supported unless '
+      + '--allow-non-https-public-url is also set!',
+    )
+    .option(
+      '--allow-non-https-public-url',
+      'allows non-HTTPS URLs in --public-url; this should only be used when building an unpublished application',
     )
     .option(
       '--release-channel <channel-name>',

src/bin/setup/android/index.ts

@@ -101,7 +101,9 @@ async function _shellAppPostDownloadAction(sdkVersion: string, workingdir: strin
 async function _installNodeModules(cwd: string) {
   l.info(`installing dependencies in ${cwd} directory...`);
   const command = await _shouldUseYarnOrNpm();
-  await ExponentTools.spawnAsyncThrowError(command, ['install'], {
+  // Keep in sync with /Dockerfile
+  // --prod requires --ignore-scripts (otherwise expo-yarn-workspaces errors as missing)
+  await ExponentTools.spawnAsyncThrowError(command, ['install', '--ignore-scripts', '--production'], {
     pipeToLogger: true,
     loggerFields: LOGGER_FIELDS,
     cwd,

src/bin/utils/builder.ts

@@ -1,6 +1,6 @@
 import _url from 'url';
 
-import { ConfigError, getExpoSDKVersion } from '@expo/config';
+import { ConfigError, getExpoSDKVersion, ProjectConfig } from '@expo/config';
 import { ExponentTools } from '@expo/xdl';
 import _ from 'lodash';
 import uuid from 'uuid';
@@ -57,7 +57,7 @@ export function createBuilderAction({
         );
       }
 
-      if (cmd.publicUrl) {
+      if (cmd.publicUrl && !cmd.allowNonHttpsPublicUrl) {
         const parsedPublicUrl = _url.parse(cmd.publicUrl);
         if (parsedPublicUrl.protocol !== 'https:') {
           throw new ErrorWithCommandHelp('--public-url is invalid - only HTTPS urls are supported');
@@ -74,12 +74,12 @@ export function createBuilderAction({
         publicUrl: cmd.publicUrl,
       };
 
-      const appJSON = await ProjectUtils.loadAppJSON(projectDirArg, cmd.config);
-      const sdkVersion = getExpoSDKVersionSafely(projectAbsoluteDir, appJSON);
+      const projectConfig = await ProjectUtils.getConfig(projectDirArg, cmd.config);
+      const sdkVersion = getExpoSDKVersionSafely(projectAbsoluteDir, projectConfig);
       await setup(platform, sdkVersion);
       const credentials = await prepareCredentials(cmd);
       const rawJob = {
-        ...await buildJobObject(platform, appJSON, args, credentials, sdkVersion),
+        ...await buildJobObject(platform, projectConfig, args, credentials, sdkVersion),
         ...cmd.buildDir && { fakeUploadDir: ProjectUtils.resolveAbsoluteDir(cmd.buildDir) },
         ...cmd.output && { fakeUploadBuildPath: ProjectUtils.resolveAbsoluteDir(cmd.output) },
       };
@@ -97,9 +97,9 @@ export function createBuilderAction({
   };
 }
 
-function getExpoSDKVersionSafely(projectDir: string, appJSON?: any) {
+function getExpoSDKVersionSafely(projectDir: string, projectConfig: ProjectConfig) {
   try {
-    return getExpoSDKVersion(projectDir, appJSON && appJSON.expo);
+    return getExpoSDKVersion(projectDir, projectConfig.exp);
   } catch (err) {
     if (err instanceof ConfigError) {
       throw new Error(
@@ -114,20 +114,21 @@ function getExpoSDKVersionSafely(projectDir: string, appJSON?: any) {
 
 const buildJobObject = async (
   platform: 'android' | 'ios',
-  appJSON: any,
+  projectConfig: ProjectConfig,
   { releaseChannel, buildType, buildMode, username, publicUrl, projectDir }: any,
   credentials: any,
   sdkVersion: string,
 ) => {
-  const experienceName = `@${_.get(appJSON, 'expo.owner', username)}/${_.get(appJSON, 'expo.slug')}`;
+  const owner = projectConfig.exp.owner || username;
+  const experienceName = `@${owner}/${projectConfig.exp.slug}`;
   const job = {
     config: {
-      ..._.get(appJSON, `expo.${platform}.config`, {}),
+      ...(projectConfig.exp?.[platform]?.config || {}),
       buildType,
       ...(platform === 'android' ? { buildMode } : {}),
       releaseChannel,
-      ...(platform === 'ios' ? { bundleIdentifier: _.get(appJSON, 'expo.ios.bundleIdentifier') } : {}),
-      ...(platform === 'android' ? { androidPackage: _.get(appJSON, 'expo.android.package') } : {}),
+      ...(platform === 'ios' ? { bundleIdentifier: projectConfig.exp?.ios?.bundleIdentifier } : {}),
+      ...(platform === 'android' ? { androidPackage: projectConfig.exp?.android?.package } : {}),
       publicUrl,
     },
     id: uuid.v4(),

src/bin/utils/project.ts

@@ -1,20 +1,18 @@
-import fs from 'fs-extra';
 import path from 'path';
 
-export async function loadAppJSON(projectDirArg: string, config: string | null) {
-  let appJSONPath;
+import { getConfig as getProjectConfig, setCustomConfigPath } from '@expo/config';
+import fs from 'fs-extra';
+
+export async function getConfig(projectDir: string, config: string | null) {
+  projectDir = resolveAbsoluteDir(projectDir);
   if (config) {
-    appJSONPath = resolveAbsoluteDir(config);
-  } else {
-    const projectDir = resolveAbsoluteDir(projectDirArg);
-    appJSONPath = path.join(projectDir, 'app.json');
-  }
-  const appJSONExists = await fs.pathExists(appJSONPath);
-  if (!appJSONExists) {
-    throw new Error(`Couldn't find app.json.`);
-  } else {
-    return require(appJSONPath);
+    const pathToConfig = path.resolve(process.cwd(), config);
+    if (!await fs.pathExists(pathToConfig)) {
+      throw new Error(`File at provided config path does not exist: ${pathToConfig}`);
+    }
+    setCustomConfigPath(projectDir, pathToConfig);
   }
+  return await getProjectConfig(projectDir, {});
 }
 
 export const resolveAbsoluteDir = (dir: string) => {

src/builders/android.ts

@@ -3,7 +3,6 @@ import path from 'path';
 import { AndroidShellApp, ImageUtils } from '@expo/xdl';
 import fs from 'fs-extra';
 import _ from 'lodash';
-import semver from 'semver';
 import { ANDROID_BUILD_TYPES } from 'turtle/constants';
 import uuidv4 from 'uuid/v4';
 
@@ -11,7 +10,7 @@ import getOrCreateCredentials from 'turtle/builders/utils/android/credentials';
 import { formatShellAppDirectory } from 'turtle/builders/utils/android/workingdir';
 import * as commonUtils from 'turtle/builders/utils/common';
 import * as imageHelpers from 'turtle/builders/utils/image';
-import { resolveExplicitOptIn } from 'turtle/builders/utils/unimodules';
+import { resolveExplicitOptIn, resolveNativeModules } from 'turtle/builders/utils/unimodules';
 import { uploadBuildToS3 } from 'turtle/builders/utils/uploader';
 import { ensureCanBuildSdkVersion } from 'turtle/builders/utils/version';
 import config from 'turtle/config';
@@ -73,15 +72,20 @@ async function runShellAppBuilder(
   const sdkVersion = _.get(manifest, 'sdkVersion', sdkVersionFromJob);
   const workingDir = formatShellAppDirectory({ sdkVersion });
 
-  // (2019-07-31) We are explicitly choosing to disable this option until we have more
-  // infrastructure/tooling built around optional modules and OTA updates, as right now it's
-  // very easy for developers to break apps in production with optional modules.
+  // Default behaviour:
+  // - load all modules except [expo-branch]
+  // - load expo-branch only if present in package.json dependencies
   //
-  // to enable full resolver switch resolveExplicitOptIn to resolveNativeModules
+  // Behaviour with "enableDangerousExperimentalLeanBuilds" flag enabled
+  // - add unimodules from `manifest.dependencies` (project package.json dependecies)
+  // - add unimodules from react-native-unimodules package.json
+  // - add unimodules from expo package package.json
+  // - add recusively all dependecies of already added unimodules
   logger.info({ buildPhase: 'resolve native modules' }, 'Resolving universal modules dependencies');
-  const enabledModules = semver.satisfies(sdkVersion, '>= 33.0.0')
-    ? await resolveExplicitOptIn(workingDir, _.get(manifest, 'dependencies'))
-    : null;
+  const packageJsonDependecies = _.get(manifest, 'dependencies');
+  const enabledModules = _.get(manifest, 'android.enableDangerousExperimentalLeanBuilds')
+    ? await resolveNativeModules(workingDir, packageJsonDependecies)
+    : await resolveExplicitOptIn(workingDir, packageJsonDependecies);
 
   try {
     await AndroidShellApp.createAndroidShellAppAsync({

src/config.ts

@@ -1,3 +1,4 @@
+import fs from 'fs';
 import os from 'os';
 import path from 'path';
 
@@ -44,8 +45,17 @@ export default {
     intervalMs: env('DATADOG_INTERVAL_MS', 5 * 60 * 1000),
   },
   redis: {
-    url: env('REDIS_URL'),
-    configUrl: env('REDIS_CONFIG_URL'),
+    main: {
+      url: env('REDIS_URL'),
+      caCertificate: envTransform(
+        'REDIS_CA_CERTIFICATE',
+        null,
+        (caCertificate: string) => caCertificate && fs.readFileSync(caCertificate),
+      ),
+    },
+    turtle: {
+      url: env('REDIS_CONFIG_URL'),
+    },
   },
   logger: {
     level: env('LOGGER_LEVEL', 'info'),
@@ -81,7 +91,7 @@ export default {
     androidDependenciesDir: env(
       'TURTLE_ANDROID_DEPENDENCIES_DIR',
       path.join(os.homedir(), '.turtle/androidDependencies'),
-      ),
+    ),
     tempS3LogsDir: env('TURTLE_TEMP_S3_LOGS_DIR', '/tmp/logs'),
     fakeUploadDir: envOptional('TURTLE_FAKE_UPLOAD_DIR'),
     temporaryFilesRoot: env(

src/jobManager.ts

@@ -10,7 +10,7 @@ import logger from 'turtle/logger';
 import * as buildDurationMetric from 'turtle/metrics/buildDuration';
 import * as buildStatusMetric from 'turtle/metrics/buildStatus';
 import { checkShouldExit, setCurrentJobId, turtleVersion } from 'turtle/turtleContext';
-import { getPriorities } from 'turtle/utils/priorities';
+import { getPriorities, labelConfiguration, TurtleMode } from 'turtle/utils/priorities';
 import * as redis from 'turtle/utils/redis';
 import { sanitizeJob } from 'turtle/validator';
 
@@ -22,8 +22,8 @@ function _maybeExit() {
 }
 
 export async function doJob() {
-  const jobData = await getJob();
-  await processJob(jobData);
+  const { job, turtleMode } = await getJob();
+  await processJob(job, turtleMode);
   _maybeExit();
 }
 
@@ -34,6 +34,7 @@ export async function getJob() {
     try {
       let job = null;
       const priorities = await getPriorities();
+      const turtleMode = labelConfiguration(priorities);
       for (const priority of priorities) {
         job = await sqs.receiveMessage(priority);
         _maybeExit();
@@ -44,7 +45,7 @@ export async function getJob() {
       }
       _maybeExit();
       if (job !== null) {
-        return job;
+        return { job, turtleMode };
       }
     } catch (err) {
       logger.error({ err }, 'Error at receiving messages');
@@ -52,7 +53,7 @@ export async function getJob() {
   }
 }
 
-async function processJob(jobData: any) {
+async function processJob(jobData: any, turtleMode: TurtleMode) {
   const receiptHandle = jobData.ReceiptHandle;
   const { priority } = jobData;
 
@@ -92,7 +93,7 @@ async function processJob(jobData: any) {
       let buildFailed = false;
       const buildType = _.get(job, 'config.buildType', 'default');
       try {
-        const status = await build(job);
+        const status = await build(job, turtleMode);
         buildStatusMetric.add(buildType, priority, status);
         buildFailed = !status;
       } catch (err) {
@@ -137,7 +138,7 @@ function failAfterMaxJobTime(priority: string, receiptHandle: string, job: any)
   }, config.builder.maxJobTimeMs);
 }
 
-async function build(job: any) {
+async function build(job: any, turtleMode: TurtleMode) {
   const startTimestamp = Date.now();
   const s3Url = await logger.initForJob(job);
   const calculateBuildDuration = () => Math.ceil((Date.now() - startTimestamp) / 1000);
@@ -146,6 +147,7 @@ async function build(job: any) {
     await sqs.sendMessage(job.id, BUILD.JOB_STATES.IN_PROGRESS, {
       logUrl: s3Url,
       logFormat: 'json',
+      turtleMode,
     });
     const result = await (builders as any)[job.platform](job);
     const buildDuration = calculateBuildDuration();

src/metrics/buildersConfig.ts

@@ -5,11 +5,11 @@ import take from 'lodash/take';
 import logger from 'turtle/logger';
 import { sendMetric } from 'turtle/metrics/datadog';
 import { getReplicaCount } from 'turtle/utils/metadata';
-import { getLabeledConfiguration, TurtleModeLabels } from 'turtle/utils/priorities';
+import { getLabeledConfiguration, TurtleMode } from 'turtle/utils/priorities';
 
 const createMetricName = () => `turtle.replicaCount`;
-const createModeMetricName = (mode: TurtleModeLabels) => `${createMetricName()}.${mode}`;
-const createModeTag = (mode: TurtleModeLabels) => `mode:${mode}`;
+const createModeMetricName = (mode: TurtleMode) => `${createMetricName()}.${mode}`;
+const createModeTag = (mode: TurtleMode) => `mode:${mode}`;
 
 export default async function sendConfigToDatadog() {
   let configuration;
@@ -30,28 +30,28 @@ export default async function sendConfigToDatadog() {
 
   const metricName = createMetricName();
 
-  const normalReplicaCount = replicaCounts[TurtleModeLabels.Normal] || 0;
-  const highReplicaCount = replicaCounts[TurtleModeLabels.High] || 0;
-  const highOnlyReplicaCount = replicaCounts[TurtleModeLabels.HighOnly] || 0;
+  const normalReplicaCount = replicaCounts[TurtleMode.Normal] || 0;
+  const highReplicaCount = replicaCounts[TurtleMode.High] || 0;
+  const highOnlyReplicaCount = replicaCounts[TurtleMode.HighOnly] || 0;
 
-  const normalTag = createModeTag(TurtleModeLabels.Normal);
-  const normalMetricName = createModeMetricName(TurtleModeLabels.Normal);
+  const normalTag = createModeTag(TurtleMode.Normal);
+  const normalMetricName = createModeMetricName(TurtleMode.Normal);
   logger.debug(
     `Sending ${metricName}=${normalReplicaCount} (${normalTag}), ${normalMetricName}=${normalReplicaCount} to Datadog`,
   );
   await sendMetric(metricName, normalReplicaCount, [normalTag]);
   await sendMetric(normalMetricName, normalReplicaCount);
 
-  const highTag = createModeTag(TurtleModeLabels.High);
-  const highMetricName = createModeMetricName(TurtleModeLabels.High);
+  const highTag = createModeTag(TurtleMode.High);
+  const highMetricName = createModeMetricName(TurtleMode.High);
   logger.debug(
     `Sending ${metricName}=${highReplicaCount} (${highTag}), ${highMetricName}=${highReplicaCount} to Datadog`,
   );
   await sendMetric(metricName, highReplicaCount, [highTag]);
   await sendMetric(highMetricName, highReplicaCount);
 
-  const highOnlyTag = createModeTag(TurtleModeLabels.HighOnly);
-  const highOnlyMetricName = createModeMetricName(TurtleModeLabels.HighOnly);
+  const highOnlyTag = createModeTag(TurtleMode.HighOnly);
+  const highOnlyMetricName = createModeMetricName(TurtleMode.HighOnly);
   logger.debug(
     `Sending ${metricName}=${highOnlyReplicaCount} (${highOnlyTag}),`
     + ` ${highOnlyMetricName}=${highOnlyReplicaCount} to Datadog`,

src/types/declarations.d.ts

@@ -4,7 +4,6 @@ declare module 'bunyan-sentry-stream';
 declare module 'bunyan-debug-stream';
 declare module 'copy';
 declare module 'dogapi';
-declare module 'ioredis';
 declare module 'is-semver';
 declare module 'request-progress';
 declare module '@expo/xdl';

src/utils/priorities.ts

@@ -9,7 +9,7 @@ import { getRedisClient, RedisClient } from 'turtle/utils/redis';
 export const NORMAL = 'normalPriority';
 export const HIGH = 'highPriority';
 
-export enum TurtleModeLabels {
+export enum TurtleMode {
   Normal = 'normal',
   High = 'high',
   HighOnly = 'highOnly',
@@ -100,13 +100,15 @@ async function getConfiguration(currentRedisClient: any) {
 
 export async function getLabeledConfiguration(currentRedisClient?: any) {
   const configuration = await getConfiguration(currentRedisClient);
-  return configuration.map((i: string[]) => {
-    if (isEqual(i, NORMAL_CONFIGURATION)) {
-      return TurtleModeLabels.Normal;
-    } else if (isEqual(i, HIGH_CONFIGURATION)) {
-      return TurtleModeLabels.High;
-    } else {
-      return TurtleModeLabels.HighOnly;
-    }
-  });
+  return configuration.map((i: string[]) => labelConfiguration(i));
+}
+
+export function labelConfiguration(configuration: string[]): TurtleMode {
+  if (isEqual(configuration, NORMAL_CONFIGURATION)) {
+    return TurtleMode.Normal;
+  } else if (isEqual(configuration, HIGH_CONFIGURATION)) {
+    return TurtleMode.High;
+  } else {
+    return TurtleMode.HighOnly;
+  }
 }

src/utils/redis.ts

@@ -12,18 +12,27 @@ export enum RedisClient {
   Configuration = 'REDIS_CLIENT_CONFIGURATION',
 }
 
-interface IClientConfig { [key: string]: string; }
+interface IClientConfig {
+  [key: string]: {
+    url: string;
+    caCertificate?: string;
+  };
+}
 
-const clientToUrl: IClientConfig = {
-  [RedisClient.Subscriber]: config.redis.url,
-  [RedisClient.Default]: config.redis.url,
-  [RedisClient.Configuration]: config.redis.configUrl,
+const clientConfigs: IClientConfig = {
+  [RedisClient.Subscriber]: config.redis.main,
+  [RedisClient.Default]: config.redis.main,
+  [RedisClient.Configuration]: config.redis.turtle,
 };
 
 export function connect(timeoutMs: number, type: string): Promise<any> {
   return new Promise((resolve, reject) => {
-    const redisClient = new Redis(clientToUrl[type], {
+    const { url, caCertificate } = clientConfigs[type];
+    const redisClient = new Redis(url, {
       maxRetriesPerRequest: 2,
+      ...caCertificate && {
+        tls: { ca: caCertificate },
+      },
     });
     const timer = setTimeout(() => reject(new Error('Timeout at connecting to Redis')), timeoutMs);
     redisClient.on('ready', () => {

src/utils/versions.ts

@@ -38,9 +38,9 @@ async function setTurtleVersion(version: string) {
 function resolveWWWEndpoint() {
   const currentEnv = config.deploymentEnv;
   if (currentEnv === 'production') {
-    return 'https://expo.io';
+    return 'https://exp.host';
   } else if (currentEnv === 'staging') {
-    return 'https://staging.expo.io';
+    return 'https://staging.exp.host';
   } else {
     return 'http://127.0.0.1:3000';
   }