fix: conformance client should have support for GOOGLE_RUNTIME_VERSION env var (#123)

Author: Kenneth Rosario

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

@@ -22,6 +22,11 @@ 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
       event-builder-source:
         description: Background function source; relative to repo root
         type: string
@@ -155,6 +160,7 @@ jobs:
             -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 }} \
             -start-delay=${{ inputs.start-delay }} \
             -output-file=${{ inputs.output-file }} \

.github/workflows/main.yml

@@ -39,4 +39,5 @@ jobs:
         -validate-mapping=false \
         -builder-source='testdata' \
         -builder-target='HTTP' \
-        -builder-runtime='go113'
+        -builder-runtime='go113' \
+        -builder-runtime-version='1.13'

README.md

@@ -89,6 +89,7 @@ Frameworks to the Functions Framework contract.
 | `-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-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. |
 | `-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. |

action/action.yml

@@ -28,6 +28,9 @@ 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: ''
   tag:
     description: 'GCR tag to use for builder image'
     default: 'latest'

action/dist/index.js

@@ -26,6 +26,7 @@ async function run() {
   const source = core.getInput('source');
   const target = core.getInput('target');
   const runtime = core.getInput('runtime');
+  const runtimeVersion = core.getInput('runtimeVersion');
   const tag = core.getInput('tag');
   const useBuildpacks = core.getInput('useBuildpacks');
   const cmd = core.getInput('cmd');
@@ -64,6 +65,7 @@ async function run() {
     `-builder-source=${source}`,
     `-builder-target=${target}`,
     `-builder-runtime=${runtime}`,
+    `-builder-runtime-version=${runtimeVersion}`,
     `-builder-tag=${tag}`,
     `-buildpacks=${useBuildpacks}`,
     `-cmd=${cmd}`,

action/dist/index.js.map

@@ -42,6 +42,7 @@ type buildpacksFunctionServer struct {
 	target             string
 	funcType           string
 	runtime            string
+	runtimeVersion     string
 	tag                string
 	ctID               string
 	logStdout          *os.File
@@ -108,6 +109,7 @@ func (b *buildpacksFunctionServer) build(ctx context.Context) error {
 			"GOOGLE_FUNCTION_TARGET":         b.target,
 			"GOOGLE_FUNCTION_SIGNATURE_TYPE": b.funcType,
 			"GOOGLE_RUNTIME":                 b.runtime,
+			"GOOGLE_RUNTIME_VERSION":         b.runtimeVersion,
 			"X_GOOGLE_TARGET_PLATFORM":       gcfTargetPlatform,
 		},
 	})

action/src/index.ts

@@ -34,6 +34,7 @@ var (
 	target                  = flag.String("builder-target", "", "function target to use in building. Required if -buildpacks=true")
 	runtime                 = flag.String("builder-runtime", "", "runtime to use in building. Required if -buildpacks=true")
 	tag                     = flag.String("builder-tag", "latest", "builder image tag to use in building")
+	runtimeVersion          = flag.String("builder-runtime-version", "", "runtime version used when building.")
 	startDelay              = flag.Uint("start-delay", 1, "Seconds to wait before sending HTTP request to command process")
 	validateConcurrencyFlag = flag.Bool("validate-concurrency", false, "whether to validate concurrent requests can be handled, requires a function that sleeps for 1 second ")
 	envs                    = flag.String("envs", "", "a comma separated string of additional runtime environment variables")
@@ -64,6 +65,7 @@ func main() {
 		source:               *source,
 		target:               *target,
 		runtime:              *runtime,
+		runtimeVersion:       *runtimeVersion,
 		functionSignature:    *functionSignature,
 		declarativeSignature: *declarativeSignature,
 		tag:                  *tag,

client/buildpacks.go

@@ -33,6 +33,7 @@ type validatorParams struct {
 	source               string
 	target               string
 	runtime              string
+	runtimeVersion       string
 	tag                  string
 	functionSignature    string
 	declarativeSignature string
@@ -53,13 +54,13 @@ type validator struct {
 
 func newValidator(params validatorParams) *validator {
 	v := validator{
-		validateMapping:     params.validateMapping,
-		validateConcurrency: params.validateConcurrency,
-		functionSignature:   params.functionSignature,
+		validateMapping:      params.validateMapping,
+		validateConcurrency:  params.validateConcurrency,
+		functionSignature:    params.functionSignature,
 		declarativeSignature: params.declarativeSignature,
-		functionOutputFile:  params.outputFile,
-		stdoutFile:          defaultStdoutFile,
-		stderrFile:          defaultStderrFile,
+		functionOutputFile:   params.outputFile,
+		stdoutFile:           defaultStdoutFile,
+		stderrFile:           defaultStderrFile,
 	}
 
 	if !params.useBuildpacks {
@@ -75,12 +76,13 @@ func newValidator(params validatorParams) *validator {
 	}
 
 	v.funcServer = &buildpacksFunctionServer{
-		source:   params.source,
-		target:   params.target,
-		runtime:  params.runtime,
-		tag:      params.tag,
-		funcType: params.functionSignature,
-		envs:     params.envs,
+		source:         params.source,
+		target:         params.target,
+		runtime:        params.runtime,
+		runtimeVersion: params.runtimeVersion,
+		tag:            params.tag,
+		funcType:       params.functionSignature,
+		envs:           params.envs,
 	}
 	return &v
 }
@@ -194,7 +196,7 @@ func (v validator) validateTyped(url string) error {
 	if !reflect.DeepEqual(resJson.Payload, req) {
 		return fmt.Errorf("Got response.Payload = %v, wanted %v", resJson.Payload, req)
 	}
-	
+
 	return nil
 }