Remove functions buildpacks from heroku/builder:22 (#398)

A new functions only builder image variant was added in #392 (see that PR for why), and now the functions Kodon instances have been switched to use this new image in: heroku/kodon#408 As such, the functions buildpacks in `heroku/builder:22` are now unused and can be removed. In addition, the functions examples have been moved under the functions builder's directory, since its now the only builder using them. GUS-W-14194543.
heroku · Oct 2, 2023 · 5df7586 · 5df7586
1 parent 580af9b
commit 5df7586
Show file tree

Hide file tree

Showing 28 changed files with 2 additions and 20 deletions.
diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml
@@ -104,7 +104,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        builder: ["builder-22", "salesforce-functions"]
+        builder: ["salesforce-functions"]
         language: ["java", "javascript", "typescript"]
     steps:
       - name: Checkout
@@ -122,7 +122,7 @@ jobs:
       - name: Load Docker images into the Docker daemon
         run: zstd -dc --long=31 images.tar.zst | docker load
       - name: Build example function image
-        run: pack build example-function --path examples/functions/${{ matrix.language }} --builder ${{ matrix.builder }} --trust-builder --pull-policy never
+        run: pack build example-function --path salesforce-functions/examples/${{ matrix.language }} --builder ${{ matrix.builder }} --trust-builder --pull-policy never
       - name: Start example function image
         run: docker run --name example-function --detach -p 8080:8080 --env PORT=8080 --env DYNO=web.1 example-function
       - name: Test example function web server response

diff --git a/builder-22/builder.toml b/builder-22/builder.toml
@@ -16,18 +16,10 @@ version = "0.17.1"
   id = "heroku/java"
   uri = "docker://docker.io/heroku/buildpack-java@sha256:3b69171e416c8062b3caefc97c206cd006a197773e380d09cb7f704a10147dee"
 
-[[buildpacks]]
-  id = "heroku/java-function"
-  uri = "docker://docker.io/heroku/buildpack-java-function@sha256:4cbe8d4984f70fc63e6b0fcea1b904d4246d90bbe0b9cc10ba8b73c98eda3b00"
-
 [[buildpacks]]
   id = "heroku/nodejs"
   uri = "docker://docker.io/heroku/buildpack-nodejs@sha256:5000a0f8ca2f440bedc24dd1a75dd20c60ffb8ff1708b7490d67aa290f280606"
 
-[[buildpacks]]
-  id = "heroku/nodejs-function"
-  uri = "docker://docker.io/heroku/buildpack-nodejs-function@sha256:69d61df4e1805055fcf2911e75f5fed59b02292f2bda7c78b6f891e8d8cd00f3"
-
 [[buildpacks]]
   id = "heroku/php"
   uri = "docker://docker.io/heroku/buildpack-php@sha256:19e44139b850b3b9040f21d436ec693f0dff82e931bbff500e9876f4febacd0e"
@@ -78,21 +70,11 @@ version = "0.17.1"
     version = "2.0.1"
     optional = true
 
-[[order]]
-  [[order.group]]
-    id = "heroku/nodejs-function"
-    version = "1.1.6"
-
 [[order]]
   [[order.group]]
     id = "heroku/nodejs"
     version = "1.1.6"
 
-[[order]]
-  [[order.group]]
-    id = "heroku/java-function"
-    version = "3.2.0"
-
 [[order]]
   [[order.group]]
     id = "heroku/java"

diff --git a/.../.mvn/wrapper/MavenWrapperDownloader.java → .../.mvn/wrapper/MavenWrapperDownloader.java b/.../.mvn/wrapper/MavenWrapperDownloader.java → .../.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/...ava/.mvn/wrapper/maven-wrapper.properties → ...ava/.mvn/wrapper/maven-wrapper.properties b/...ava/.mvn/wrapper/maven-wrapper.properties → ...ava/.mvn/wrapper/maven-wrapper.properties
diff --git a/examples/functions/java/mvnw → salesforce-functions/examples/java/mvnw b/examples/functions/java/mvnw → salesforce-functions/examples/java/mvnw
diff --git a/examples/functions/java/mvnw.cmd → salesforce-functions/examples/java/mvnw.cmd b/examples/functions/java/mvnw.cmd → salesforce-functions/examples/java/mvnw.cmd
diff --git a/examples/functions/java/pom.xml → salesforce-functions/examples/java/pom.xml b/examples/functions/java/pom.xml → salesforce-functions/examples/java/pom.xml
diff --git a/examples/functions/java/project.toml → ...orce-functions/examples/java/project.toml b/examples/functions/java/project.toml → ...orce-functions/examples/java/project.toml
diff --git a/...va/src/main/java/com/example/Account.java → ...va/src/main/java/com/example/Account.java b/...va/src/main/java/com/example/Account.java → ...va/src/main/java/com/example/Account.java
diff --git a/.../main/java/com/example/FunctionInput.java → .../main/java/com/example/FunctionInput.java b/.../main/java/com/example/FunctionInput.java → .../main/java/com/example/FunctionInput.java
diff --git a/...main/java/com/example/FunctionOutput.java → ...main/java/com/example/FunctionOutput.java b/...main/java/com/example/FunctionOutput.java → ...main/java/com/example/FunctionOutput.java
diff --git a/...example/JavafunctionscaffoldFunction.java → ...example/JavafunctionscaffoldFunction.java b/...example/JavafunctionscaffoldFunction.java → ...example/JavafunctionscaffoldFunction.java
diff --git a/...c/test/java/com/example/FunctionTest.java → ...c/test/java/com/example/FunctionTest.java b/...c/test/java/com/example/FunctionTest.java → ...c/test/java/com/example/FunctionTest.java
diff --git a/examples/functions/javascript/.eslintrc → ...e-functions/examples/javascript/.eslintrc b/examples/functions/javascript/.eslintrc → ...e-functions/examples/javascript/.eslintrc
diff --git a/examples/functions/javascript/.mocharc.json → ...nctions/examples/javascript/.mocharc.json b/examples/functions/javascript/.mocharc.json → ...nctions/examples/javascript/.mocharc.json
diff --git a/examples/functions/javascript/README.md → ...e-functions/examples/javascript/README.md b/examples/functions/javascript/README.md → ...e-functions/examples/javascript/README.md
diff --git a/examples/functions/javascript/index.js → ...ce-functions/examples/javascript/index.js b/examples/functions/javascript/index.js → ...ce-functions/examples/javascript/index.js
diff --git a/examples/functions/javascript/package.json → ...unctions/examples/javascript/package.json b/examples/functions/javascript/package.json → ...unctions/examples/javascript/package.json
diff --git a/examples/functions/javascript/project.toml → ...unctions/examples/javascript/project.toml b/examples/functions/javascript/project.toml → ...unctions/examples/javascript/project.toml
diff --git a/...s/functions/javascript/test/index.test.js → ...ns/examples/javascript/test/index.test.js b/...s/functions/javascript/test/index.test.js → ...ns/examples/javascript/test/index.test.js
diff --git a/examples/functions/typescript/.eslintrc → ...e-functions/examples/typescript/.eslintrc b/examples/functions/typescript/.eslintrc → ...e-functions/examples/typescript/.eslintrc
diff --git a/examples/functions/typescript/.mocharc.json → ...nctions/examples/typescript/.mocharc.json b/examples/functions/typescript/.mocharc.json → ...nctions/examples/typescript/.mocharc.json
diff --git a/examples/functions/typescript/README.md → ...e-functions/examples/typescript/README.md b/examples/functions/typescript/README.md → ...e-functions/examples/typescript/README.md
diff --git a/examples/functions/typescript/index.ts → ...ce-functions/examples/typescript/index.ts b/examples/functions/typescript/index.ts → ...ce-functions/examples/typescript/index.ts
diff --git a/examples/functions/typescript/package.json → ...unctions/examples/typescript/package.json b/examples/functions/typescript/package.json → ...unctions/examples/typescript/package.json
diff --git a/examples/functions/typescript/project.toml → ...unctions/examples/typescript/project.toml b/examples/functions/typescript/project.toml → ...unctions/examples/typescript/project.toml
diff --git a/...s/functions/typescript/test/index.test.ts → ...ns/examples/typescript/test/index.test.ts b/...s/functions/typescript/test/index.test.ts → ...ns/examples/typescript/test/index.test.ts
diff --git a/examples/functions/typescript/tsconfig.json → ...nctions/examples/typescript/tsconfig.json b/examples/functions/typescript/tsconfig.json → ...nctions/examples/typescript/tsconfig.json