From 5df7586da2b0c02fa481bc59bac678dd32580d45 Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Mon, 2 Oct 2023 11:46:41 +0000 Subject: [PATCH] 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: https://github.com/heroku/kodon/pull/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. --- .github/workflows/build-test-publish.yml | 4 ++-- builder-22/builder.toml | 18 ------------------ .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../java/.mvn/wrapper/maven-wrapper.properties | 0 .../examples}/java/mvnw | 0 .../examples}/java/mvnw.cmd | 0 .../examples}/java/pom.xml | 0 .../examples}/java/project.toml | 0 .../src/main/java/com/example/Account.java | 0 .../main/java/com/example/FunctionInput.java | 0 .../main/java/com/example/FunctionOutput.java | 0 .../example/JavafunctionscaffoldFunction.java | 0 .../test/java/com/example/FunctionTest.java | 0 .../examples}/javascript/.eslintrc | 0 .../examples}/javascript/.mocharc.json | 0 .../examples}/javascript/README.md | 0 .../examples}/javascript/index.js | 0 .../examples}/javascript/package.json | 0 .../examples}/javascript/project.toml | 0 .../examples}/javascript/test/index.test.js | 0 .../examples}/typescript/.eslintrc | 0 .../examples}/typescript/.mocharc.json | 0 .../examples}/typescript/README.md | 0 .../examples}/typescript/index.ts | 0 .../examples}/typescript/package.json | 0 .../examples}/typescript/project.toml | 0 .../examples}/typescript/test/index.test.ts | 0 .../examples}/typescript/tsconfig.json | 0 28 files changed, 2 insertions(+), 20 deletions(-) rename {examples/functions => salesforce-functions/examples}/java/.mvn/wrapper/MavenWrapperDownloader.java (100%) rename {examples/functions => salesforce-functions/examples}/java/.mvn/wrapper/maven-wrapper.properties (100%) rename {examples/functions => salesforce-functions/examples}/java/mvnw (100%) rename {examples/functions => salesforce-functions/examples}/java/mvnw.cmd (100%) rename {examples/functions => salesforce-functions/examples}/java/pom.xml (100%) rename {examples/functions => salesforce-functions/examples}/java/project.toml (100%) rename {examples/functions => salesforce-functions/examples}/java/src/main/java/com/example/Account.java (100%) rename {examples/functions => salesforce-functions/examples}/java/src/main/java/com/example/FunctionInput.java (100%) rename {examples/functions => salesforce-functions/examples}/java/src/main/java/com/example/FunctionOutput.java (100%) rename {examples/functions => salesforce-functions/examples}/java/src/main/java/com/example/JavafunctionscaffoldFunction.java (100%) rename {examples/functions => salesforce-functions/examples}/java/src/test/java/com/example/FunctionTest.java (100%) rename {examples/functions => salesforce-functions/examples}/javascript/.eslintrc (100%) rename {examples/functions => salesforce-functions/examples}/javascript/.mocharc.json (100%) rename {examples/functions => salesforce-functions/examples}/javascript/README.md (100%) rename {examples/functions => salesforce-functions/examples}/javascript/index.js (100%) rename {examples/functions => salesforce-functions/examples}/javascript/package.json (100%) rename {examples/functions => salesforce-functions/examples}/javascript/project.toml (100%) rename {examples/functions => salesforce-functions/examples}/javascript/test/index.test.js (100%) rename {examples/functions => salesforce-functions/examples}/typescript/.eslintrc (100%) rename {examples/functions => salesforce-functions/examples}/typescript/.mocharc.json (100%) rename {examples/functions => salesforce-functions/examples}/typescript/README.md (100%) rename {examples/functions => salesforce-functions/examples}/typescript/index.ts (100%) rename {examples/functions => salesforce-functions/examples}/typescript/package.json (100%) rename {examples/functions => salesforce-functions/examples}/typescript/project.toml (100%) rename {examples/functions => salesforce-functions/examples}/typescript/test/index.test.ts (100%) rename {examples/functions => salesforce-functions/examples}/typescript/tsconfig.json (100%) diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index 6a917e8..7afa7ae 100644 --- 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 index d7bc8fc..f2d6b92 100644 --- 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/examples/functions/java/.mvn/wrapper/MavenWrapperDownloader.java b/salesforce-functions/examples/java/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from examples/functions/java/.mvn/wrapper/MavenWrapperDownloader.java rename to salesforce-functions/examples/java/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/examples/functions/java/.mvn/wrapper/maven-wrapper.properties b/salesforce-functions/examples/java/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from examples/functions/java/.mvn/wrapper/maven-wrapper.properties rename to salesforce-functions/examples/java/.mvn/wrapper/maven-wrapper.properties diff --git a/examples/functions/java/mvnw b/salesforce-functions/examples/java/mvnw similarity index 100% rename from examples/functions/java/mvnw rename to salesforce-functions/examples/java/mvnw diff --git a/examples/functions/java/mvnw.cmd b/salesforce-functions/examples/java/mvnw.cmd similarity index 100% rename from examples/functions/java/mvnw.cmd rename to salesforce-functions/examples/java/mvnw.cmd diff --git a/examples/functions/java/pom.xml b/salesforce-functions/examples/java/pom.xml similarity index 100% rename from examples/functions/java/pom.xml rename to salesforce-functions/examples/java/pom.xml diff --git a/examples/functions/java/project.toml b/salesforce-functions/examples/java/project.toml similarity index 100% rename from examples/functions/java/project.toml rename to salesforce-functions/examples/java/project.toml diff --git a/examples/functions/java/src/main/java/com/example/Account.java b/salesforce-functions/examples/java/src/main/java/com/example/Account.java similarity index 100% rename from examples/functions/java/src/main/java/com/example/Account.java rename to salesforce-functions/examples/java/src/main/java/com/example/Account.java diff --git a/examples/functions/java/src/main/java/com/example/FunctionInput.java b/salesforce-functions/examples/java/src/main/java/com/example/FunctionInput.java similarity index 100% rename from examples/functions/java/src/main/java/com/example/FunctionInput.java rename to salesforce-functions/examples/java/src/main/java/com/example/FunctionInput.java diff --git a/examples/functions/java/src/main/java/com/example/FunctionOutput.java b/salesforce-functions/examples/java/src/main/java/com/example/FunctionOutput.java similarity index 100% rename from examples/functions/java/src/main/java/com/example/FunctionOutput.java rename to salesforce-functions/examples/java/src/main/java/com/example/FunctionOutput.java diff --git a/examples/functions/java/src/main/java/com/example/JavafunctionscaffoldFunction.java b/salesforce-functions/examples/java/src/main/java/com/example/JavafunctionscaffoldFunction.java similarity index 100% rename from examples/functions/java/src/main/java/com/example/JavafunctionscaffoldFunction.java rename to salesforce-functions/examples/java/src/main/java/com/example/JavafunctionscaffoldFunction.java diff --git a/examples/functions/java/src/test/java/com/example/FunctionTest.java b/salesforce-functions/examples/java/src/test/java/com/example/FunctionTest.java similarity index 100% rename from examples/functions/java/src/test/java/com/example/FunctionTest.java rename to salesforce-functions/examples/java/src/test/java/com/example/FunctionTest.java diff --git a/examples/functions/javascript/.eslintrc b/salesforce-functions/examples/javascript/.eslintrc similarity index 100% rename from examples/functions/javascript/.eslintrc rename to salesforce-functions/examples/javascript/.eslintrc diff --git a/examples/functions/javascript/.mocharc.json b/salesforce-functions/examples/javascript/.mocharc.json similarity index 100% rename from examples/functions/javascript/.mocharc.json rename to salesforce-functions/examples/javascript/.mocharc.json diff --git a/examples/functions/javascript/README.md b/salesforce-functions/examples/javascript/README.md similarity index 100% rename from examples/functions/javascript/README.md rename to salesforce-functions/examples/javascript/README.md diff --git a/examples/functions/javascript/index.js b/salesforce-functions/examples/javascript/index.js similarity index 100% rename from examples/functions/javascript/index.js rename to salesforce-functions/examples/javascript/index.js diff --git a/examples/functions/javascript/package.json b/salesforce-functions/examples/javascript/package.json similarity index 100% rename from examples/functions/javascript/package.json rename to salesforce-functions/examples/javascript/package.json diff --git a/examples/functions/javascript/project.toml b/salesforce-functions/examples/javascript/project.toml similarity index 100% rename from examples/functions/javascript/project.toml rename to salesforce-functions/examples/javascript/project.toml diff --git a/examples/functions/javascript/test/index.test.js b/salesforce-functions/examples/javascript/test/index.test.js similarity index 100% rename from examples/functions/javascript/test/index.test.js rename to salesforce-functions/examples/javascript/test/index.test.js diff --git a/examples/functions/typescript/.eslintrc b/salesforce-functions/examples/typescript/.eslintrc similarity index 100% rename from examples/functions/typescript/.eslintrc rename to salesforce-functions/examples/typescript/.eslintrc diff --git a/examples/functions/typescript/.mocharc.json b/salesforce-functions/examples/typescript/.mocharc.json similarity index 100% rename from examples/functions/typescript/.mocharc.json rename to salesforce-functions/examples/typescript/.mocharc.json diff --git a/examples/functions/typescript/README.md b/salesforce-functions/examples/typescript/README.md similarity index 100% rename from examples/functions/typescript/README.md rename to salesforce-functions/examples/typescript/README.md diff --git a/examples/functions/typescript/index.ts b/salesforce-functions/examples/typescript/index.ts similarity index 100% rename from examples/functions/typescript/index.ts rename to salesforce-functions/examples/typescript/index.ts diff --git a/examples/functions/typescript/package.json b/salesforce-functions/examples/typescript/package.json similarity index 100% rename from examples/functions/typescript/package.json rename to salesforce-functions/examples/typescript/package.json diff --git a/examples/functions/typescript/project.toml b/salesforce-functions/examples/typescript/project.toml similarity index 100% rename from examples/functions/typescript/project.toml rename to salesforce-functions/examples/typescript/project.toml diff --git a/examples/functions/typescript/test/index.test.ts b/salesforce-functions/examples/typescript/test/index.test.ts similarity index 100% rename from examples/functions/typescript/test/index.test.ts rename to salesforce-functions/examples/typescript/test/index.test.ts diff --git a/examples/functions/typescript/tsconfig.json b/salesforce-functions/examples/typescript/tsconfig.json similarity index 100% rename from examples/functions/typescript/tsconfig.json rename to salesforce-functions/examples/typescript/tsconfig.json