Skip to content

Commit 83fdac7

Browse files
Update index.js
1 parent 80aacac commit 83fdac7

File tree

4 files changed

+19
-63
lines changed

4 files changed

+19
-63
lines changed

.github/workflows/run-validation.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,15 @@ jobs:
5353
activeRevisionsMode: 'Labels'
5454
targetLabel: ${{ vars.TEST_TARGET_LABEL }}
5555

56-
# - name: Delete created Azure Container App
57-
# if: ${{ always() }}
58-
# shell: bash
59-
# run: az containerapp delete -n ${{ env.TEST_CONTAINER_APP_NAME }} -g ${{ vars.TEST_RESOURCE_GROUP_NAME }} -y
56+
- name: Wait before deletion
57+
if: ${{ always() }}
58+
shell: bash
59+
run: sleep 21
60+
61+
- name: Delete created Azure Container App
62+
if: ${{ always() }}
63+
shell: bash
64+
run: az containerapp delete -n ${{ env.TEST_CONTAINER_APP_NAME }} -g ${{ vars.TEST_RESOURCE_GROUP_NAME }} -y
6065

6166

6267
create-using-image-yaml-linux:
@@ -107,6 +112,11 @@ jobs:
107112
activeRevisionsMode: 'Labels'
108113
targetLabel: ${{ vars.TEST_TARGET_LABEL }}
109114

115+
- name: Wait before deletion
116+
if: ${{ always() }}
117+
shell: bash
118+
run: sleep 21
119+
110120
- name: Delete created Azure Container App
111121
if: ${{ always() }}
112122
shell: bash
@@ -158,6 +168,11 @@ jobs:
158168
resourceGroup: ${{ vars.TEST_RESOURCE_GROUP_NAME }}
159169
disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }}
160170

171+
- name: Wait before deletion
172+
if: ${{ always() }}
173+
shell: bash
174+
run: sleep 21
175+
161176
- name: Delete created Azure Container App
162177
if: ${{ always() }}
163178
shell: bash

action.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,6 @@ inputs:
139139
this GitHub Action.'
140140
required: false
141141
default: 'false'
142-
activeRevisionsMode:
143-
description: |
144-
'Possible options: Labels and Single. If set to "Labels", the action will use the targetLabel argument to
145-
determine the label to apply to the Container App revision.'
146-
required: false
147-
default: 'Labels'
148142
targetLabel:
149143
description: |
150144
'Specifies the target label for the Azure Container App revision.

azurecontainerapps.ts

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ export class azurecontainerapps {
106106
private static buildArguments: string;
107107
private static noIngressUpdate: boolean;
108108
private static useInternalRegistry: boolean;
109-
private static activeRevisionsMode: string;
110109
private static targetLabel: string;
111110

112111
/**
@@ -179,35 +178,6 @@ export class azurecontainerapps {
179178
throw Error(conflictingArgumentsMessage);
180179
}
181180

182-
this.toolHelper.writeDebug("Setting default value for activeRevisionsMode: 'Labels'");
183-
this.activeRevisionsMode = 'Labels'; // Default value for active revisions mode
184-
185-
if (!this.util.isNullOrEmpty(this.activeRevisionsMode)) {
186-
this.toolHelper.writeDebug("activeRevisionsMode is not null or empty, attempting to get input...");
187-
188-
// Set the active revisions mode to use for the Container App, if provided
189-
this.activeRevisionsMode = this.toolHelper.getInput('activeRevisionsMode', false);
190-
this.toolHelper.writeDebug(`Retrieved activeRevisionsMode input: ${this.activeRevisionsMode}`);
191-
192-
if (this.activeRevisionsMode !== 'Labels' && this.activeRevisionsMode !== 'Single') {
193-
const invalidActiveRevisionsModeMessage = `The 'activeRevisionsMode' argument must be either 'Labels' or 'Single'.`;
194-
this.toolHelper.writeError(invalidActiveRevisionsModeMessage);
195-
throw Error(invalidActiveRevisionsModeMessage);
196-
}
197-
198-
if (this.activeRevisionsMode === 'Labels') {
199-
this.toolHelper.writeDebug("activeRevisionsMode is 'Labels'. Checking for targetLabel...");
200-
201-
this.targetLabel = this.toolHelper.getInput('targetLabel', false);
202-
this.toolHelper.writeDebug(`Retrieved targetLabel input: ${this.targetLabel}`);
203-
if (this.util.isNullOrEmpty(this.targetLabel)) {
204-
const missingTargetLabelMessage = `The 'targetLabel' argument must be provided when 'activeRevisionsMode' is set to 'Labels'.`;
205-
this.toolHelper.writeError(missingTargetLabelMessage);
206-
throw Error(missingTargetLabelMessage);
207-
}
208-
}
209-
}
210-
211181
// Set up the build arguments to pass to the Dockerfile or builder
212182
if (!this.util.isNullOrEmpty(this.buildArguments)) {
213183
// Ensure that the build arguments are in the format 'key1=value1 key2=value2'

dist/index.js

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -184,29 +184,6 @@ var azurecontainerapps = /** @class */ (function () {
184184
this.toolHelper.writeError(conflictingArgumentsMessage);
185185
throw Error(conflictingArgumentsMessage);
186186
}
187-
this.toolHelper.writeDebug("Setting default value for activeRevisionsMode: 'Labels'");
188-
this.activeRevisionsMode = 'Labels'; // Default value for active revisions mode
189-
if (!this.util.isNullOrEmpty(this.activeRevisionsMode)) {
190-
this.toolHelper.writeDebug("activeRevisionsMode is not null or empty, attempting to get input...");
191-
// Set the active revisions mode to use for the Container App, if provided
192-
this.activeRevisionsMode = this.toolHelper.getInput('activeRevisionsMode', false);
193-
this.toolHelper.writeDebug("Retrieved activeRevisionsMode input: ".concat(this.activeRevisionsMode));
194-
if (this.activeRevisionsMode !== 'Labels' && this.activeRevisionsMode !== 'Single') {
195-
var invalidActiveRevisionsModeMessage = "The 'activeRevisionsMode' argument must be either 'Labels' or 'Single'.";
196-
this.toolHelper.writeError(invalidActiveRevisionsModeMessage);
197-
throw Error(invalidActiveRevisionsModeMessage);
198-
}
199-
if (this.activeRevisionsMode === 'Labels') {
200-
this.toolHelper.writeDebug("activeRevisionsMode is 'Labels'. Checking for targetLabel...");
201-
this.targetLabel = this.toolHelper.getInput('targetLabel', false);
202-
this.toolHelper.writeDebug("Retrieved targetLabel input: ".concat(this.targetLabel));
203-
if (this.util.isNullOrEmpty(this.targetLabel)) {
204-
var missingTargetLabelMessage = "The 'targetLabel' argument must be provided when 'activeRevisionsMode' is set to 'Labels'.";
205-
this.toolHelper.writeError(missingTargetLabelMessage);
206-
throw Error(missingTargetLabelMessage);
207-
}
208-
}
209-
}
210187
// Set up the build arguments to pass to the Dockerfile or builder
211188
if (!this.util.isNullOrEmpty(this.buildArguments)) {
212189
// Ensure that the build arguments are in the format 'key1=value1 key2=value2'

0 commit comments

Comments
 (0)