Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -366233,23 +366233,28 @@ class CloudFunction {
? opts.serviceAccountEmail
: null;
request.vpcConnector = (opts === null || opts === void 0 ? void 0 : opts.vpcConnector) ? opts.vpcConnector : null;
request.vpcConnectorEgressSettings = (opts === null || opts === void 0 ? void 0 : opts.vpcConnectorEgressSettings)
? opts.vpcConnectorEgressSettings
: null;
request.ingressSettings = (opts === null || opts === void 0 ? void 0 : opts.ingressSettings)
? opts.ingressSettings
: null;
request.timeout = (opts === null || opts === void 0 ? void 0 : opts.timeout) ? `${opts.timeout}s` : null;
request.maxInstances = (opts === null || opts === void 0 ? void 0 : opts.maxInstances) ? opts.maxInstances : null;
request.availableMemoryMb = (opts === null || opts === void 0 ? void 0 : opts.availableMemoryMb)
? opts.availableMemoryMb
: null;
// Only one of envVars and envVarsFile should be set
if ((opts === null || opts === void 0 ? void 0 : opts.envVars) && (opts === null || opts === void 0 ? void 0 : opts.envVarsFile)) {
throw new Error('Only one of env_vars or env_vars_file can be specified.');
}
// Parse env vars
let envVars;
if (opts === null || opts === void 0 ? void 0 : opts.envVars) {
envVars = this.parseKVPairs(opts.envVars);
request.environmentVariables = envVars;
}
if (opts === null || opts === void 0 ? void 0 : opts.envVarsFile) {
envVars = this.parseEnvVarsFile(opts.envVarsFile);
// Check if `envVars` or `envVarsFile` are set.
// If two var keys are the same between `envVars` and `envVarsFile`
// `envVars` will override the one on `envVarsFile`
if ((opts === null || opts === void 0 ? void 0 : opts.envVars) || (opts === null || opts === void 0 ? void 0 : opts.envVarsFile)) {
let envVars;
if (opts === null || opts === void 0 ? void 0 : opts.envVarsFile) {
envVars = this.parseEnvVarsFile(opts.envVarsFile);
}
if (opts === null || opts === void 0 ? void 0 : opts.envVars) {
envVars = Object.assign(Object.assign({}, envVars), this.parseKVPairs(opts.envVars));
}
request.environmentVariables = envVars;
}
if (opts === null || opts === void 0 ? void 0 : opts.labels) {
Expand Down Expand Up @@ -366541,6 +366546,8 @@ class CloudFunctionClient {
'entryPoint',
'runtime',
'vpcConnector',
'vpcConnectorEgressSettings',
'ingressSettings',
'serviceAccountEmail',
'timeout',
'maxInstances',
Expand Down Expand Up @@ -366715,6 +366722,8 @@ function run() {
const entryPoint = core.getInput('entry_point');
const sourceDir = core.getInput('source_dir');
const vpcConnector = core.getInput('vpc_connector');
const vpcConnectorEgressSettings = core.getInput('vpc_connector_egress_settings');
const ingressSettings = core.getInput('ingress_settings');
const serviceAccountEmail = core.getInput('service_account_email');
const timeout = core.getInput('timeout');
const maxInstances = core.getInput('max_instances');
Expand Down Expand Up @@ -366742,6 +366751,8 @@ function run() {
eventTriggerService,
deployTimeout,
vpcConnector,
vpcConnectorEgressSettings,
ingressSettings,
serviceAccountEmail,
labels,
});
Expand Down