Merge branch 'main' into dependabot/npm_and_yarn/action/actions/core-1.9.1

Author: akerekes

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: Check compiled action script CI
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
 jobs:
   compile:
@@ -12,7 +12,7 @@ jobs:
     - name: Setup Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: 14.x
+        node-version: 18.x
     - name: Build Action
       run: cd action && npm i && npm run all
     - name: Check if there's a diff
@@ -26,5 +26,5 @@ jobs:
     - name: Lint Code Base
       uses: github/super-linter@v4
       env:
-        DEFAULT_BRANCH: master
+        DEFAULT_BRANCH: main
         VALIDATE_JSON: true

.github/workflows/buildpack-integration-test.yml

@@ -22,6 +22,16 @@ on:
         description: GCF runtime (e.g. 'go116')
         type: string
         required: true
+      builder-runtime-version:
+        description: GCF runtime version (e.g. 3.7.0 for python37 runtime or 1.16 for go116)
+        type: string
+        default: ''
+        required: false
+      builder-url:
+        description: Builder image including builder tag to use while building. (e.g. gcr.io/gae-runtimes/buildpacks/go/builder:latest or gcr.io/buildpacks/builder:latest )
+        type: string
+        default: ''
+        required: false
       event-builder-source:
         description: Background function source; relative to repo root
         type: string
@@ -61,7 +71,7 @@ on:
         # breaking changes
         description: Conformance GitHub Actions version by git ref
         type: string
-        default: 'master'
+        default: 'main'
         required: false
 jobs:
   # Download and cache the Functions Framework conformance test client
@@ -151,11 +161,20 @@ jobs:
         if: ${{ matrix.builder-source }}
         run: |
           client \
-          -type=${{ matrix.type }} \
-          -builder-source=${{ matrix.builder-source }} \
-          -builder-target=${{ matrix.builder-target }} \
-          -builder-runtime=${{ inputs.builder-runtime }} \
-          -builder-tag=${{ inputs.builder-tag }} \
-          -start-delay=${{ inputs.start-delay }} \
-          -output-file=${{ inputs.output-file }} \
-          -validate-mapping=false
+            -type=${{ matrix.type }} \
+            -builder-source=${{ matrix.builder-source }} \
+            -builder-target=${{ matrix.builder-target }} \
+            -builder-runtime=${{ inputs.builder-runtime }} \
+            -builder-runtime-version=${{ inputs.builder-runtime-version }} \
+            -builder-tag=${{ inputs.builder-tag }} \
+            -builder-url=${{ inputs.builder-url }} \
+            -start-delay=${{ inputs.start-delay }} \
+            -output-file=${{ inputs.output-file }} \
+            -validate-mapping=false
+      - name: 'Upload Artifact'
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: ${{ matrix.type }}_buildpack_integ_logs
+          path: /tmp/ff_*
+          retention-days: 5

.github/workflows/buildpack-integration-workflow-validation.yml

@@ -0,0 +1,21 @@
+name: Buildpack Integration Test Workflow Validation
+on:
+    push:
+        branches:
+            - main
+    pull_request:
+jobs:
+    validate-workflow:
+        strategy:
+            matrix:
+                builder-url: ['gcr.io/gae-runtimes/buildpacks/go/builder:latest', '']
+        uses: ./.github/workflows/buildpack-integration-test.yml
+        with:
+            builder-runtime: 'go113'
+            builder-runtime-version: '1.13'
+            http-builder-source: 'testdata'
+            http-builder-target: 'HTTP'
+            cloudevent-builder-source: ''
+            cloudevent-builder-target: ''
+            builder-url: ${{ matrix.builder-url }}
+            conformance-client-version: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}

.github/workflows/main.yml

@@ -2,7 +2,7 @@ name: Conformance test framework validation CI
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
 jobs:
   run-conformance:
@@ -39,4 +39,6 @@ jobs:
         -validate-mapping=false \
         -builder-source='testdata' \
         -builder-target='HTTP' \
-        -builder-runtime='go113'
+        -builder-runtime='go113' \
+        -builder-runtime-version='1.13' \
+        -builder-url='gcr.io/gae-runtimes/buildpacks/go/builder:latest'

.github/workflows/unit.yml

@@ -2,7 +2,7 @@ name: Unit test CI
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
 jobs:
   test:

.gitignore

@@ -7,7 +7,7 @@ BUILD
 action/node_modules
 action/lib
 
-## From https://github.com/github/gitignore/blob/master/Go.gitignore
+## From https://github.com/github/gitignore/blob/main/Go.gitignore
 
 # Binaries for programs and plugins
 *.exe
@@ -19,7 +19,7 @@ action/lib
 # Test binary, built with `go test -c`
 *.test
 
-## From https://github.com/github/gitignore/blob/master/Node.gitignore
+## From https://github.com/github/gitignore/blob/main/Node.gitignore
 
 # Logs
 logs

README.md

@@ -17,6 +17,10 @@ Frameworks to the Functions Framework contract.
      parameters to JSON in the format:
        `{"data": ...data..., "context": ...context...}`
      and write the resulting string.
+    - The `typed` function should accept a JSON request object and should echo
+      the request object back in the "payload" field of the response. I.e. if
+      the request is `{"a":"b"}` the response should be `{"payload":{"a":
+      "b"}}`.
 
 1.  Build the test client:
 
@@ -58,6 +62,15 @@ Frameworks to the Functions Framework contract.
           -type=legacyevent \
           -buildpacks=false
         ```
+    - **Ruby __typed http__** function Example:
+
+        ```sh
+        $HOME/functions-framework-conformance/client/client \
+          -cmd="bundle exec functions-framework-ruby --source test/conformance/app.rb --target typed_func --signature-type http" \
+          --type=http \
+          --declarative-type=typed \
+          -buildpacks=false
+        ```
 
     If there are validation errors, an error will be logged in the output, causing your conformance test to fail.
 
@@ -68,15 +81,19 @@ Frameworks to the Functions Framework contract.
 | Configuration flag | Type | Default | Description |
 | --- | --- | --- | --- |
 | `-cmd` | string | `"''"` | A string with the command to run a Functions Framework server at `localhost:8080`. Must be wrapped in quotes. Ignored if `-buildpacks=true`. |
-| `-type` | string | `"http"` | Type of function to validate (must be `"http"`, `"cloudevent"`, or `"legacyevent"`). |
+| `-type` | string | `"http"` | The function signature to use (must be `"http"`, `"cloudevent"`, or `"legacyevent"`). |
+| `-declarative-type` | string | `""` | The declarative signature type of the function (must be 'http', 'cloudevent', 'legacyevent', or 'typed'), default matches -type |
 | `-validate-mapping` | boolean | `true` | Whether to validate mapping from legacy->cloud events and vice versa (as applicable). |
 | `-output-file` | string | `"function_output.json"` | Name of file output by function. |
 | `-buildpacks` | boolean | `true` | Whether to use the current release of buildpacks to run the validation. If `true`, `-cmd` is ignored and `--builder-*` flags must be set. |
 | `-builder-source` | string | `""` | Function source directory to use in building. Required if `-buildpacks=true`. |
 | `-builder-target` | string | `""` | Function target to use in building. Required if `-buildpacks=true`. |
 | `-builder-runtime` | string | `""` | Runtime to use in building. Required if `-buildpacks=true`. |
-| `-builder-tag` | string | `"latest"` | Builder image tag to use in building. |
+| `-builder-runtime-version` | string | `""` | Runtime version used while building. Buildpack will use the latest version if flag is not specified. |
+| `-builder-tag` | string | `"latest"` | Builder image tag to use in building. Ignored if `-builder-url` is specified. |
+| `-builder-url` | string | `""` | Builder image url to use in building including tag. Client defaults to `gcr.io/gae-runtimes/buildpacks/<language>/builder:<builder-tag>` if none is specified. |
 | `-start-delay` | uint | `1` | Seconds to wait before sending HTTP request to command process. |
+| `-envs` | string | `""` | A comma separated string of additional runtime environment variables. |
 
 </nobr>
 

action/action.yml

@@ -8,8 +8,11 @@ inputs:
     description: 'output file from function'
     default: 'function_output.json'
   functionType:
-    description: 'type of function'
+    description: 'invocation signature type of function'
     default: 'http'
+  declarativeType:
+    description: 'declarative type of the function as defined in code i.e. a typed declarative function uses the http invocation type'
+    default: ''
   validateMapping:
     description: 'whether to validate mapping from legacy->cloud event and vice versa'
     default: true
@@ -25,6 +28,12 @@ inputs:
   runtime:
     description: 'function runtime (e.g. nodejs10, go113)'
     default: ''
+  runtimeVersion:
+    description: 'function runtime version, uses the latest version if not specified (e.g. 3.7.4 for python37 runtime)'
+    default: ''
+  builderURL:
+    description: 'builder url to use when building'
+    default: ''
   tag:
     description: 'GCR tag to use for builder image'
     default: 'latest'
@@ -40,6 +49,9 @@ inputs:
   workingDirectory:
     description: 'The subdirectory in which the conformance tests should run'
     default: ""
+  runtimeEnvs:
+    description: 'A comma separated list of runtime environment variable overrides'
+    default: ""
 runs:
   using: 'node12'
   main: 'dist/index.js'