add changes for sidecar

Author: kumaraksh1

lib/DeploymentProvider/DeploymentProviderFactory.js

@@ -6,11 +6,12 @@ const BaseWebAppDeploymentProvider_1 = require("./Providers/BaseWebAppDeployment
 const WebAppContainerDeployment_1 = require("./Providers/WebAppContainerDeployment");
 const WebAppDeploymentProvider_1 = require("./Providers/WebAppDeploymentProvider");
 const PublishProfileWebAppContainerDeploymentProvider_1 = require("./Providers/PublishProfileWebAppContainerDeploymentProvider");
+const PublishProfileSiteContainersWebAppDeploymentProvider_1 = require("./Providers/PublishProfileSiteContainersWebAppDeploymentProvider");
 class DeploymentProviderFactory {
     static getDeploymentProvider(type) {
         if (type === BaseWebAppDeploymentProvider_1.DEPLOYMENT_PROVIDER_TYPES.PUBLISHPROFILE) {
             if (!!actionparameters_1.ActionParameters.getActionParams().sidecarConfig) {
-                return new PublishProfileWebAppContainerDeploymentProvider_1.PublishProfileWebAppContainerDeploymentProvider(type);
+                return new PublishProfileSiteContainersWebAppDeploymentProvider_1.PublishProfileSiteContainersWebAppDeploymentProvider(type);
             }
             else if (!!actionparameters_1.ActionParameters.getActionParams().images) {
                 return new PublishProfileWebAppContainerDeploymentProvider_1.PublishProfileWebAppContainerDeploymentProvider(type);

lib/DeploymentProvider/Providers/PublishProfileSiteContainersWebAppDeploymentProvider.js

@@ -11,17 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PublishProfileSiteContainersWebAppDeploymentProvider = void 0;
 const BaseWebAppDeploymentProvider_1 = require("./BaseWebAppDeploymentProvider");
-const ContainerDeploymentUtility_1 = require("azure-actions-appservice-rest/Utilities/ContainerDeploymentUtility");
+const SiteContainerDeploymentUtility_1 = require("azure-actions-appservice-rest/Utilities/SiteContainerDeploymentUtility");
 class PublishProfileSiteContainersWebAppDeploymentProvider extends BaseWebAppDeploymentProvider_1.BaseWebAppDeploymentProvider {
     DeployWebAppStep() {
         return __awaiter(this, void 0, void 0, function* () {
-            let containerDeploymentUtility = new ContainerDeploymentUtility_1.ContainerDeploymentUtility(this.appService);
-            let images = this.actionParams.images;
-            let configFile = this.actionParams.multiContainerConfigFile;
-            let isLinux = this.actionParams.isLinux;
-            let isMultiContainer = this.actionParams.isMultiContainer;
-            let startupCommand = this.actionParams.startupCommand;
-            yield containerDeploymentUtility.deployWebAppImage(images, configFile, isLinux, isMultiContainer, startupCommand);
+            let siteContainerDeploymentUtility = new SiteContainerDeploymentUtility_1.SiteContainerDeploymentUtility(this.appService);
+            let sidecarContainers = this.actionParams.sidecarConfig;
+            yield siteContainerDeploymentUtility.updateSiteContainers(sidecarContainers);
         });
     }
 }

lib/actionparameters.js

@@ -53,6 +53,12 @@ exports.appKindMap = new Map([
     ['app,linux', WebAppKind.SiteContainers],
     ['api', WebAppKind.Windows],
 ]);
+// export interface SidecarContainer {
+//     name: string;
+//     image: string;
+//     targetPort: number;
+//     isMain: boolean;
+// }
 class ActionParameters {
     constructor(endpoint) {
         this._publishProfileContent = core.getInput('publish-profile');

src/ActionInputValidator/Validations.ts

@@ -3,9 +3,10 @@ import * as core from '@actions/core';
 import { Package, exist } from "azure-actions-utility/packageUtility";
 import { PublishProfile, ScmCredentials } from "../Utilities/PublishProfile";
 import RuntimeConstants from '../RuntimeConstants';
-import { ActionParameters, SidecarContainer } from "../actionparameters";
+import { ActionParameters } from "../actionparameters";
 
 import fs = require('fs');
+import { SiteContainer } from 'azure-actions-appservice-rest/Arm/SiteContainer';
 
 // Error is app-name is not provided
 export function appNameIsRequired(appname: string) {
@@ -40,7 +41,7 @@ export function validateAppDetails() {
 
 // Error if Sidecar configuration is provided
 
-export function sidecarConfigNotAllowed(sitecontainers: SidecarContainer[]) {
+export function sidecarConfigNotAllowed(sitecontainers: SiteContainer[]) {
     if(!!sitecontainers) {
         throw new Error("Sitecontainer not valid input for this web app.");
     }

src/DeploymentProvider/DeploymentProviderFactory.ts

@@ -5,13 +5,14 @@ import { IWebAppDeploymentProvider } from "./Providers/IWebAppDeploymentProvider
 import { WebAppContainerDeploymentProvider } from "./Providers/WebAppContainerDeployment";
 import { WebAppDeploymentProvider } from "./Providers/WebAppDeploymentProvider";
 import { PublishProfileWebAppContainerDeploymentProvider } from "./Providers/PublishProfileWebAppContainerDeploymentProvider";
+import { PublishProfileSiteContainersWebAppDeploymentProvider } from "./Providers/PublishProfileSiteContainersWebAppDeploymentProvider";
 
 export class DeploymentProviderFactory {
 
     public static getDeploymentProvider(type: DEPLOYMENT_PROVIDER_TYPES) : IWebAppDeploymentProvider {
         if (type === DEPLOYMENT_PROVIDER_TYPES.PUBLISHPROFILE) {
             if (!!ActionParameters.getActionParams().sidecarConfig) {
-                return new PublishProfileWebAppContainerDeploymentProvider(type);
+                return new PublishProfileSiteContainersWebAppDeploymentProvider(type);
             }
             else
             if (!!ActionParameters.getActionParams().images) {

src/DeploymentProvider/Providers/PublishProfileSiteContainersWebAppDeploymentProvider.ts

@@ -1,15 +1,10 @@
 import { BaseWebAppDeploymentProvider } from './BaseWebAppDeploymentProvider';
-import { ContainerDeploymentUtility } from 'azure-actions-appservice-rest/Utilities/ContainerDeploymentUtility';
+import { SiteContainerDeploymentUtility } from 'azure-actions-appservice-rest/Utilities/SiteContainerDeploymentUtility';
 
 export class PublishProfileSiteContainersWebAppDeploymentProvider extends BaseWebAppDeploymentProvider {
     public async DeployWebAppStep() {
-        let containerDeploymentUtility: ContainerDeploymentUtility = new ContainerDeploymentUtility(this.appService);
-        
-        let images = this.actionParams.images;
-        let configFile = this.actionParams.multiContainerConfigFile;
-        let isLinux = this.actionParams.isLinux;
-        let isMultiContainer = this.actionParams.isMultiContainer;
-        let startupCommand = this.actionParams.startupCommand;
-        await containerDeploymentUtility.deployWebAppImage(images, configFile, isLinux, isMultiContainer, startupCommand);
+        let siteContainerDeploymentUtility = new SiteContainerDeploymentUtility(this.appService);
+        let sidecarContainers = this.actionParams.sidecarConfig;
+        await siteContainerDeploymentUtility.updateSiteContainers(sidecarContainers);
     }
 }

src/actionparameters.ts

@@ -1,6 +1,7 @@
 import * as core from '@actions/core';
 import { IAuthorizer } from "azure-actions-webclient/Authorizer/IAuthorizer";
 import { Package } from 'azure-actions-utility/packageUtility';
+import { SiteContainer } from 'azure-actions-appservice-rest/Arm/SiteContainer';
 const github = require('@actions/github');
 
 export enum WebAppKind {
@@ -20,12 +21,12 @@ export const appKindMap = new Map([
     [ 'api', WebAppKind.Windows ],
 ]);
 
-export interface SidecarContainer {
-    name: string;
-    image: string;
-    targetPort: number;
-    isMain: boolean;
-}
+// export interface SidecarContainer {
+//     name: string;
+//     image: string;
+//     targetPort: number;
+//     isMain: boolean;
+// }
 
 export class ActionParameters {
     private static actionparams: ActionParameters;
@@ -44,7 +45,7 @@ export class ActionParameters {
     private _isMultiContainer: boolean;
     private _isLinux: boolean;
     private _commitMessage: string;
-    private _sidecarConfig: SidecarContainer[];
+    private _sidecarConfig: SiteContainer[];
 
     // Used only for OneDeploy
     private _type: string;
@@ -85,11 +86,11 @@ export class ActionParameters {
         return this.actionparams;
     }
 
-    public get sidecarConfig(): SidecarContainer[] {
+    public get sidecarConfig(): SiteContainer[] {
         return this._sidecarConfig;
     }
 
-    private parseSidecarConfig(config: string): SidecarContainer[] {
+    private parseSidecarConfig(config: string): SiteContainer[] {
         try {
             const parsedConfig = JSON.parse(config);
             if (!Array.isArray(parsedConfig)) {