Remove Fed 1 from main (#491)

This simplifies the repo into a single Cargo workspace which removes a
bunch of extra infrastructure. The idea is we can have a `v1` or
`support/v1` branch where we can still make tweaks to fed 1 (e.g.,
security fixes) without it being in the way for new fed 2 work.

Author: dylan-apollo

.cargo/config renamed to .cargo/config.toml

@@ -6,7 +6,6 @@
   // Keep automerge off for now, while we validate this works.
   "automerge": false,
   "ignorePaths": [
-  
     // Add the Renovate config:base defaults
     "**/node_modules/**",
     "**/bower_components/**",
@@ -15,9 +14,6 @@
     "**/fixtures/**",
     "**/test/**",
     "**/tests/**",
-
-    // But also, let's exclude Federation 1.
-    "federation-1/**"
   ],
   "packageRules": [
     // Bunch up all non-major npm dependencies into a single PR.  In the common case
@@ -29,49 +25,72 @@
     {
       "matchCurrentVersion": "< 1.0.0",
       "separateMinorPatch": true,
-      "matchManagers": [ "cargo" ],
+      "matchManagers": [
+        "cargo"
+      ],
       "minor": {
         "groupName": "cargo pre-1.0 packages",
         "groupSlug": "cargo-all-pre-1.0",
-        "automerge": false, // eventually true?
+        "automerge": false,
+        // eventually true?
       },
       "patch": {
         "groupName": "cargo pre-1.0 packages",
         "groupSlug": "cargo-all-pre-1.0",
-        "automerge": false, // eventually true?
+        "automerge": false,
+        // eventually true?
       }
     },
     // npm by itself for non-major >= 1.0.0
     {
       "matchCurrentVersion": ">= 1.0.0",
-      "matchManagers": [ "npm" ],
-      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
+      "matchManagers": [
+        "npm"
+      ],
+      "matchUpdateTypes": [
+        "minor",
+        "patch",
+        "pin",
+        "digest"
+      ],
       "groupName": "all npm non-major packages >= 1.0",
       "groupSlug": "npm-all-non-major-gte-1.0",
       "automerge": false,
     },
     // cargo by itself for non-major >= 1.0.0
     {
       "matchCurrentVersion": ">= 1.0.0",
-      "matchManagers": [ "cargo" ],
-      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
+      "matchManagers": [
+        "cargo"
+      ],
+      "matchUpdateTypes": [
+        "minor",
+        "patch",
+        "pin",
+        "digest"
+      ],
       "groupName": "all cargo non-major packages >= 1.0",
       "groupSlug": "cargo-all-non-major-gte-1.0",
       "automerge": false,
     },
-
     // We'll review these in a PR of their own since it has the most direct runtime
     // implications on users that we'd like to be very intentional about.
     {
-      "matchPackagePrefixes": ["deno_"],
+      "matchPackagePrefixes": [
+        "deno_"
+      ],
       "groupName": "deno updates",
       "groupSlug": "rust-deno-updates",
-      "matchManagers": ["cargo"],
+      "matchManagers": [
+        "cargo"
+      ],
       "automerge": false
     },
     // CentOS 8 is EOL, but 7 lives on.
     {
-      "matchPackageNames": ["centos"],
+      "matchPackageNames": [
+        "centos"
+      ],
       "allowedVersions": "7.x"
     }
   ]

CODEOWNERS renamed to .github/CODEOWNERS

@@ -1,10 +1,10 @@
 name: Publish Components
 
-on: 
+on:
   push:
     branches:
       - main
-      
+
 jobs:
   harmonizer_publish:
     if: "contains(github.event.head_commit.message, 'Automated PR for harmonizer release')"
@@ -13,16 +13,15 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
-        
+
       - name: Run Cargo xtask tag
         run: |
-          cd federation-2
           HARMONIZER_RELEASE_VERSION=composition@v`cargo metadata --format-version 1 |jq -r '.packages[] | select(.name=="harmonizer") | .version'`
           cd ..
           git config user.name "ApolloBot2"
           git config user.email "[email protected]"
           cargo xtask tag --package $HARMONIZER_RELEASE_VERSION --real-publish
-          
+
   router-bridge_publish:
     if: "contains(github.event.head_commit.message, 'Automated PR for router-bridge release')"
     name: Publish router-bridge
@@ -38,7 +37,6 @@ jobs:
 
       - name: Run Cargo xtask tag
         run: |
-          cd federation-2
           ROUTERBRIDGE_RELEASE_VERSION=router-bridge@v`cargo metadata --format-version 1 |jq -r '.packages[] | select(.name=="router-bridge") | .version'`
           cd ..
           git config user.name "ApolloBot2"

renovate.json5 renamed to .github/renovate.json5

@@ -7,11 +7,13 @@ on:
         type: string
         required: true
         description: Federation release version
-        
+
 jobs:
   harmonizer_pr:
     name: Create harmonizer release
     runs-on: ubuntu-latest
+    env:
+      VERSION: ${{ github.event.inputs.version }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
@@ -22,15 +24,14 @@ jobs:
           node-version: 16
 
       - name: start
-        run: |
-          echo "${{ github.event.inputs.version }}"
+        run: echo "$VERSION"
 
       - name: Update @apollo/composition
-        run: npm i --prefix ./federation-2/harmonizer -E @apollo/composition@${{github.event.inputs.version}}
-        
-      # - name: Install Rustup
-      #   run: curl https://sh.rustup.rs -sSf | sh -s -- -y
+        run: npm i --prefix ./harmonizer -E "@apollo/composition@$VERSION"
 
+        # - name: Install Rustup
+        #   run: curl https://sh.rustup.rs -sSf | sh -s -- -y
+
       - name: Run cargo xtask
         run: cargo xtask dist --debug
 
@@ -55,21 +56,20 @@ jobs:
       #   run: curl https://sh.rustup.rs -sSf | sh -s -- -y
 
       - name: Update @apollo/federation-internals and @apollo/query-planner
-        run: npm i --prefix ./federation-2/router-bridge @apollo/federation-internals@${{github.event.inputs.version}} @apollo/query-planner@${{github.event.inputs.version}}
+        run: npm i --prefix ./router-bridge "@apollo/federation-internals@$VERSION" "@apollo/query-planner@$VERSION"
 
       - name: Install Cargo edit
         run: cargo install cargo-edit
-        
+
       - name: Run cargo edit and cargo build
         run: |
-          echo "${{ github.event.inputs.version }}"
-          cd federation-2
-          NEW_VERSION=`cargo metadata --format-version 1 |jq -r '.packages[] | select(.name=="router-bridge") | .version' | python3 -c 'import sys; version=sys.stdin.readline().split("+")[0].split("."); version[2] = str(int(version[2]) + 1); print(".".join(version))'`+v${{ github.event.inputs.version }}
+          echo "$VERSION"
+          NEW_VERSION=`cargo metadata --format-version 1 |jq -r '.packages[] | select(.name=="router-bridge") | .version' | python3 -c 'import sys; version=sys.stdin.readline().split("+")[0].split("."); version[2] = str(int(version[2]) + 1); print(".".join(version))'`+"v$VERSION"
           echo "New version " $NEW_VERSION
           cargo set-version $NEW_VERSION -p router-bridge
           cargo build -p router-bridge
           cd router-bridge
-          npm version ${{ github.event.inputs.version }}
+          npm version "$VERSION"
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v5
         with:

.github/workflows/publish.yml

@@ -1,3 +1 @@
-rust 1.70.0
-
 nodejs 16.20.0