Revert "allow Expressions in the top-level configuration of v1 functions (#1249)" (#1252)

This reverts commit 9332ea0.

Author: Berlioz

src/v1/cloud-functions.ts

@@ -26,7 +26,6 @@ import { DeploymentOptions } from "./function-configuration";
 export { Request, Response };
 import { convertIfPresent, copyIfPresent } from "../common/encoding";
 import { ManifestEndpoint, ManifestRequiredAPI } from "../runtime/manifest";
-import { Expression } from "../params";
 
 export { Change } from "../common/change";
 
@@ -476,26 +475,17 @@ export function optionsToEndpoint(options: DeploymentOptions): ManifestEndpoint
     endpoint.vpc = { connector: options.vpcConnector };
     convertIfPresent(endpoint.vpc, options, "egressSettings", "vpcConnectorEgressSettings");
   }
-  convertIfPresent(
-    endpoint,
-    options,
-    "availableMemoryMb",
-    "memory",
-    (mem: string | Expression<number>) => {
-      if (typeof mem === "string") {
-        const memoryLookup = {
-          "128MB": 128,
-          "256MB": 256,
-          "512MB": 512,
-          "1GB": 1024,
-          "2GB": 2048,
-          "4GB": 4096,
-          "8GB": 8192,
-        };
-        return memoryLookup[mem];
-      }
-      return mem;
-    }
-  );
+  convertIfPresent(endpoint, options, "availableMemoryMb", "memory", (mem) => {
+    const memoryLookup = {
+      "128MB": 128,
+      "256MB": 256,
+      "512MB": 512,
+      "1GB": 1024,
+      "2GB": 2048,
+      "4GB": 4096,
+      "8GB": 8192,
+    };
+    return memoryLookup[mem];
+  });
   return endpoint;
 }

src/v1/function-builder.ts

@@ -50,11 +50,7 @@ import * as testLab from "./providers/testLab";
  * @throws { Error } Memory and TimeoutSeconds values must be valid.
  */
 function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean {
-  if (
-    runtimeOptions.memory &&
-    typeof runtimeOptions.memory === "string" &&
-    !VALID_MEMORY_OPTIONS.includes(runtimeOptions.memory)
-  ) {
+  if (runtimeOptions.memory && !VALID_MEMORY_OPTIONS.includes(runtimeOptions.memory)) {
     throw new Error(
       `The only valid memory allocation values are: ${VALID_MEMORY_OPTIONS.join(", ")}`
     );

src/v1/function-configuration.ts

@@ -174,23 +174,23 @@ export interface RuntimeOptions {
   /**
    * Amount of memory to allocate to the function.
    */
-  memory?: typeof VALID_MEMORY_OPTIONS[number] | Expression<number>;
+  memory?: typeof VALID_MEMORY_OPTIONS[number];
   /**
    * Timeout for the function in seconds, possible values are 0 to 540.
    */
-  timeoutSeconds?: number | Expression<number>;
+  timeoutSeconds?: number;
 
   /**
    * Min number of actual instances to be running at a given time.
    * Instances will be billed for memory allocation and 10% of CPU allocation
    * while idle.
    */
-  minInstances?: number | Expression<number>;
+  minInstances?: number;
 
   /**
    * Max number of actual instances allowed to be running in parallel.
    */
-  maxInstances?: number | Expression<number>;
+  maxInstances?: number;
 
   /**
    * Connect cloud function to specified VPC connector.