Merge branch 'master' into @sjchmiela/expo_facebook_noinit

This reverts commit beafc10133.

.secrets.local-common

@@ -6,4 +6,3 @@ SENTRY_DSN=""
 ENVIRONMENT="development"
 REDIS_URL="redis://localhost:6379/0"
 REDIS_CONFIG_URL="redis://localhost:6379/0"
-TURTLE_SDK_VERSIONS_SECRET_TOKEN="xeiw7yigha<a_r5aich!oW9Ik2eish8the9Na6Jae-ghoo5ua/t8nu5AeheiTew4"

CHANGELOG.md

@@ -7,8 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-## [0.12.9] - 2019-11-14
-
 ### Added
 
 - Support for customizing Facebook SDK behavior at buildtime (autoinitialization, logging app events, logging Advertiser ID) (https://github.com/expo/expo/pull/5924)

k8s/android/turtle-deployment.template.yml

@@ -138,11 +138,6 @@ spec:
               secretKeyRef:
                 name: turtle-js-config
                 key: datadog_app_key
-          - name: TURTLE_SDK_VERSIONS_SECRET_TOKEN
-            valueFrom:
-              secretKeyRef:
-                name: turtle-js-config
-                key: turtle_sdk_versions_secret_token
           # other vars
           - name: GRADLE_DAEMON_DISABLED
             value: "1"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.12.9",
+  "version": "0.12.8",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -75,7 +75,6 @@
     "@types/progress": "^2.0.1",
     "@types/raven": "^2.5.1",
     "@types/request": "^2.47.1",
-    "@types/request-promise": "^4.1.44",
     "@types/semver": "^6.0.0",
     "@types/sharp": "^0.17.8",
     "@types/tar": "^4.0.0",
@@ -121,7 +120,6 @@
     "raven": "^2.6.2",
     "request": "^2.88.0",
     "request-progress": "^3.0.0",
-    "request-promise": "^4.2.5",
     "semver": "^6.0.0",
     "sharp": "0.22.1",
     "source-map-support": "^0.5.6",

scripts/tests/runAndroidSmokeTestsCI.sh

@@ -22,6 +22,5 @@ export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
 export DATADOG_DISABLED="true"
-export TURTLE_SDK_VERSIONS_SECRET_TOKEN="noop"
 
 yarn test:smoke:android

scripts/tests/runIOSSmokeTestsCI.sh

@@ -20,7 +20,6 @@ export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
 export DATADOG_DISABLED="true"
-export TURTLE_SDK_VERSIONS_SECRET_TOKEN="noop"
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
 SDK_VERSION=sdk32 $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh

scripts/tests/runUnitTestsCI.sh

@@ -22,6 +22,5 @@ export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
 export DATADOG_DISABLED="true"
-export TURTLE_SDK_VERSIONS_SECRET_TOKEN="noop"
 
 yarn test:unit

src/builders/utils/ios/shellAppBuilder.ts

@@ -36,7 +36,6 @@ export default async function runShellAppBuilder(ctx: IContext, job: IJob): Prom
     manifest,
     output: ctx.outputPath,
     verbose: true,
-    shellAppSdkVersion: sdkVersion,
   };
   if (buildType === IOS_BUILD_TYPES.CLIENT) {
     Object.assign(shellAppParams, {

src/config.ts

@@ -89,7 +89,4 @@ export default {
       path.join(os.platform() === 'darwin' ? '/private' : '/', 'tmp', 'turtle'),
     ),
   },
-  www: {
-    sdkVersionsSecretToken: env('TURTLE_SDK_VERSIONS_SECRET_TOKEN'),
-  },
 };

src/logger/streams/s3.ts

@@ -1,3 +1,4 @@
+
 import EventEmitter from 'events';
 import path from 'path';
 

src/server.ts

@@ -6,7 +6,10 @@ import { doJob } from 'turtle/jobManager';
 import logger from 'turtle/logger';
 import setup from 'turtle/setup';
 import { checkShouldExit, setShouldExit, turtleVersion } from 'turtle/turtleContext';
-import { setSupportedSdkVersions, setTurtleVersion } from 'turtle/utils/versions';
+import { getRedisClient } from 'turtle/utils/redis';
+
+const REDIS_TURTLE_VERSION_KEY = 'turtle:version';
+const REDIS_TURTLE_SUPPORTED_SDK_VERSIONS_KEY = `turtle:${config.platform}:sdkVersions`;
 
 process.on('unhandledRejection', (err) => logger.error({ err }, 'Unhandled promise rejection'));
 
@@ -34,13 +37,18 @@ async function main() {
   }
 
   try {
-    await setTurtleVersion(turtleVersion);
-    logger.info(`Registered Turtle version (${turtleVersion}) in www`);
-    const sdkVersions = (await findSupportedSdkVersions(config.platform)).map((version) => `${version}.0.0`);
-    await setSupportedSdkVersions(config.platform, sdkVersions);
-    logger.info(`Registered supported SDK versions (${sdkVersions}) in www`);
+    const redis = await getRedisClient();
+    if (redis) {
+      await redis.set(REDIS_TURTLE_VERSION_KEY, turtleVersion);
+      logger.info(`Registered Turtle version (${turtleVersion}) in Redis`);
+      const sdkVersions = (await findSupportedSdkVersions(config.platform)).join(',');
+      await redis.set(REDIS_TURTLE_SUPPORTED_SDK_VERSIONS_KEY, sdkVersions);
+      logger.info(`Registered supported SDK versions (${sdkVersions}) in Redis`);
+    } else {
+      logger.warn('Couldn\'t set supported SDK versions in Redis (failed to connect to Redis)');
+    }
   } catch (err) {
-    logger.error({ err }, 'Failed to register versions in www');
+    logger.error({ err }, 'Failed to set versions in Redis');
   }
 
   while (true) {

src/utils/versions.ts

@@ -1,49 +0,0 @@
-import { URL } from 'url';
-
-import request from 'request-promise';
-
-import config from 'turtle/config';
-
-async function setSupportedSdkVersions(platform: string, sdkVersions: string[]) {
-  const { href } = new URL('/--/api/v2/standalone-build/setSupportedSDKVersions', resolveWWWEndpoint());
-  await request({
-    method: 'POST',
-    uri: href,
-    headers: {
-      'secret-token': config.www.sdkVersionsSecretToken,
-    },
-    body: {
-      platform,
-      sdkVersions,
-    },
-    json: true,
-  });
-}
-
-async function setTurtleVersion(version: string) {
-  const { href } = new URL('/--/api/v2/standalone-build/setTurtleVersion', resolveWWWEndpoint());
-  await request({
-    method: 'POST',
-    uri: href,
-    headers: {
-      'secret-token': config.www.sdkVersionsSecretToken,
-    },
-    body: {
-      version,
-    },
-    json: true,
-  });
-}
-
-function resolveWWWEndpoint() {
-  const currentEnv = config.deploymentEnv;
-  if (currentEnv === 'production') {
-    return 'https://expo.io';
-  } else if (currentEnv === 'staging') {
-    return 'https://staging.expo.io';
-  } else {
-    return 'http://127.0.0.1:3000';
-  }
-}
-
-export { setSupportedSdkVersions, setTurtleVersion };

yarn.lock

@@ -1848,11 +1848,6 @@
   resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
   integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==
 
-"@types/bluebird@*":
-  version "3.5.29"
-  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.29.tgz#7cd933c902c4fc83046517a1bef973886d00bdb6"
-  integrity sha512-kmVtnxTuUuhCET669irqQmPAez4KFnFVKvpleVRyfC3g+SHD1hIkFZcWLim9BVcwUBLO59o8VZE4yGCmTif8Yw==
-
 "@types/body-parser@*":
   version "1.17.1"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.1.tgz#18fcf61768fb5c30ccc508c21d6fd2e8b3bf7897"
@@ -2030,24 +2025,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/request-promise@^4.1.44":
-  version "4.1.44"
-  resolved "https://registry.yarnpkg.com/@types/request-promise/-/request-promise-4.1.44.tgz#05b59cd18445832fae16b68d5bb3d4621b549485"
-  integrity sha512-RId7eFsUKxfal1LirDDIcOp9u3MM3NXFDBcC3sqIMcmu7f4U6DsCEMD8RbLZtnPrQlN5Jc79di/WPsIEDO4keg==
-  dependencies:
-    "@types/bluebird" "*"
-    "@types/request" "*"
-
-"@types/request@*":
-  version "2.48.3"
-  resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.3.tgz#970b8ed2317568c390361d29c555a95e74bd6135"
-  integrity sha512-3Wo2jNYwqgXcIz/rrq18AdOZUQB8cQ34CXZo+LUwPJNpvRAL86+Kc2wwI8mqpz9Cr1V+enIox5v+WZhy/p3h8w==
-  dependencies:
-    "@types/caseless" "*"
-    "@types/node" "*"
-    "@types/tough-cookie" "*"
-    form-data "^2.5.0"
-
 "@types/request@^2.47.0", "@types/request@^2.47.1":
   version "2.48.1"
   resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.1.tgz#e402d691aa6670fbbff1957b15f1270230ab42fa"
@@ -3155,7 +3132,7 @@ bluebird@^3.3.4, bluebird@^3.4.1, bluebird@^3.5.1, bluebird@^3.5.3:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
   integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
 
-bluebird@^3.5.0, bluebird@^3.5.5:
+bluebird@^3.5.5:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz#df70e302b471d7473489acf26a93d63b53f874de"
   integrity sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==
@@ -6043,15 +6020,6 @@ [email protected]:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-form-data@^2.5.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
-  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -11778,13 +11746,6 @@ [email protected]:
   dependencies:
     lodash "^4.17.11"
 
-[email protected]:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
-  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
-  dependencies:
-    lodash "^4.17.15"
-
 [email protected]:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5"
@@ -11803,16 +11764,6 @@ request-promise-native@^1.0.5:
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
-request-promise@^4.2.5:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-4.2.5.tgz#186222c59ae512f3497dfe4d75a9c8461bd0053c"
-  integrity sha512-ZgnepCykFdmpq86fKGwqntyTiUrHycALuGggpyCZwMvGaZWgxW6yagT0FHkgo5LzYvOaCNvxYwWYIjevSH1EDg==
-  dependencies:
-    bluebird "^3.5.0"
-    request-promise-core "1.1.3"
-    stealthy-require "^1.1.1"
-    tough-cookie "^2.3.3"
-
 [email protected], request@^2.81.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"