@omnia/tooling-composers 8.0.111-vnext → 8.0.113-vnext

package/internal-do-not-import-from-here/CustomServiceComposer.d.ts

@@ -0,0 +1,11 @@
+import { ServiceOptions } from './models';
+import { IServiceManifestComposer, ServiceManifestComposer } from './ServiceManifestComposer';
+export interface ICustomServiceComposer extends IServiceManifestComposer<ICustomServiceComposer> {
+    runHelm: (cmd: string) => ICustomServiceComposer;
+}
+export declare class CustomServiceComposer extends ServiceManifestComposer<CustomServiceComposer> implements ICustomServiceComposer {
+    private manifestId;
+    private manifestTitle;
+    constructor(manifestId: string, manifestTitle: string, serviceOptions: ServiceOptions);
+    runHelm(cmd: string): this;
+}

package/internal-do-not-import-from-here/CustomServiceComposer.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomServiceComposer = void 0;
+const models_1 = require("./models");
+const Utils_1 = require("./Utils");
+const ServiceManifestRegistry_1 = require("./ServiceManifestRegistry");
+const ServiceManifestComposer_1 = require("./ServiceManifestComposer");
+class CustomServiceComposer extends ServiceManifestComposer_1.ServiceManifestComposer {
+    constructor(manifestId, manifestTitle, serviceOptions) {
+        // TODO wait hot reload update not execute composer two times
+        super(() => { return this; });
+        this.manifestId = manifestId;
+        this.manifestTitle = manifestTitle;
+        if (!Utils_1.Utils.isValidGuid(this.manifestId)) {
+            throw new Error("Can't register omnia service with id: " + this.manifestId + " must be a valid Guid");
+        }
+        let serviceInfo = {
+            description: serviceOptions.description,
+            id: manifestId,
+            serviceType: models_1.ServiceTypes.Custom,
+            title: manifestTitle,
+            optionalService: false
+        };
+        ServiceManifestRegistry_1.ServiceManifestRegistry.AddService(serviceInfo);
+    }
+    runHelm(cmd) {
+        ServiceManifestRegistry_1.ServiceManifestRegistry.getServiceInfo().hemlCommand = cmd;
+        return this;
+    }
+}
+exports.CustomServiceComposer = CustomServiceComposer;

package/internal-do-not-import-from-here/ServiceComposer.d.ts

@@ -1,6 +1,7 @@
 import { ServiceOptions } from './models';
 import { IWebAppServiceComposer } from './WebAppServiceComposer';
 import { IWorkerServiceComposer } from './WorkerServiceComposer';
+import { ICustomServiceComposer } from './CustomServiceComposer';
 export interface IRegisterService {
     /** Specify service type for this omnia service project.
     E.g. A service could be a worker, doing simple async jobs, worker queues etc
@@ -17,6 +18,10 @@ export interface IServiceComposer {
     * Register service to be of type worker
     */
     AsWorker: () => IWorkerServiceComposer;
+    /**
+    * Register service to be of custom type (to install heml)
+    */
+    AsCustom: () => ICustomServiceComposer;
 }
 export declare class ServiceComposer implements IServiceComposer {
     private manifestId;
@@ -25,4 +30,5 @@ export declare class ServiceComposer implements IServiceComposer {
     constructor(manifestId: string, manifestName: string, serviceInfo: ServiceOptions);
     AsWebApp: () => IWebAppServiceComposer;
     AsWorker: () => IWorkerServiceComposer;
+    AsCustom: () => ICustomServiceComposer;
 }

package/internal-do-not-import-from-here/ServiceComposer.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceComposer = void 0;
 const Utils_1 = require("./Utils");
-const WorkerServiceComposer_1 = require("./WorkerServiceComposer");
 const WebAppServiceComposer_1 = require("./WebAppServiceComposer");
+const WorkerServiceComposer_1 = require("./WorkerServiceComposer");
+const CustomServiceComposer_1 = require("./CustomServiceComposer");
 class ServiceComposer {
     constructor(manifestId, manifestName, serviceInfo) {
         // TODO wait hot reload update not execute composer two times
@@ -16,6 +17,9 @@ class ServiceComposer {
         this.AsWorker = () => {
             return new WorkerServiceComposer_1.WorkerServiceComposer(this.manifestId, this.manifestName, this.serviceInfo);
         };
+        this.AsCustom = () => {
+            return new CustomServiceComposer_1.CustomServiceComposer(this.manifestId, this.manifestName, this.serviceInfo);
+        };
         if (!Utils_1.Utils.isValidGuid(this.manifestId)) {
             throw new Error("Can't register service with id: " + this.manifestId + " must be a valid Guid");
         }

package/internal-do-not-import-from-here/ServiceManifestRegistry.js

@@ -8,7 +8,8 @@ class ServiceManifestRegistry {
 ServiceManifestRegistry.Service = null;
 ServiceManifestRegistry.AddService = (service) => {
     if (!(service.serviceType === index_1.ServiceTypes.WebApp ||
-        service.serviceType === index_1.ServiceTypes.Worker)) {
+        service.serviceType === index_1.ServiceTypes.Worker ||
+        service.serviceType === index_1.ServiceTypes.Custom)) {
         throw new Error("Unknown service type: " + JSON.stringify(service));
     }
     if (ServiceManifestRegistry.Service) {

package/internal-do-not-import-from-here/index.d.ts

@@ -21,3 +21,4 @@ export * from './ServiceManifestRegistry';
 export * from './ImportManifestRegistry';
 export * from "./ConfigurationClientServiceRegistry";
 export { type BuildOptions, ServiceTypes, type ElementOptions as WebComponentOptions } from "./models/index";
+export * from "./CustomServiceComposer";

package/internal-do-not-import-from-here/index.js

@@ -26,5 +26,6 @@ tslib_1.__exportStar(require("./ImportManifestRegistry"), exports);
 tslib_1.__exportStar(require("./ConfigurationClientServiceRegistry"), exports);
 var index_1 = require("./models/index");
 Object.defineProperty(exports, "ServiceTypes", { enumerable: true, get: function () { return index_1.ServiceTypes; } });
+tslib_1.__exportStar(require("./CustomServiceComposer"), exports);
 const models_1 = require("../../fx-models");
 var ignore = models_1.AuthenticationValidationStatuses;

package/internal-do-not-import-from-here/models/Enums.d.ts

@@ -5,7 +5,8 @@ export declare enum RequestedResourceTypes {
 }
 export declare enum ServiceTypes {
     WebApp = "WebAppService",
-    Worker = "WorkerService"
+    Worker = "WorkerService",
+    Custom = "CustomService"
 }
 export declare enum SecurityProviderTypes {
     RoleBased = "RoleBasedProvider",
@@ -33,7 +34,8 @@ export declare enum ServerManifestTypes {
     ServiceFeature = "servicefeature",
     ServiceAppDefinition = "serviceappdefinition",
     AzureADAppPermission = "azureadapppermission",
-    ServiceRoleDefinition = "serviceroledefinition"
+    ServiceRoleDefinition = "serviceroledefinition",
+    HemlProvider = "hemlprovider"
 }
 export declare enum BundleTargetTypes {
     Javascript = "js",

package/internal-do-not-import-from-here/models/Enums.js

@@ -11,6 +11,7 @@ var ServiceTypes;
 (function (ServiceTypes) {
     ServiceTypes["WebApp"] = "WebAppService";
     ServiceTypes["Worker"] = "WorkerService";
+    ServiceTypes["Custom"] = "CustomService";
 })(ServiceTypes = exports.ServiceTypes || (exports.ServiceTypes = {}));
 var SecurityProviderTypes;
 (function (SecurityProviderTypes) {
@@ -44,6 +45,7 @@ var ServerManifestTypes;
     ServerManifestTypes["ServiceAppDefinition"] = "serviceappdefinition";
     ServerManifestTypes["AzureADAppPermission"] = "azureadapppermission";
     ServerManifestTypes["ServiceRoleDefinition"] = "serviceroledefinition";
+    ServerManifestTypes["HemlProvider"] = "hemlprovider";
 })(ServerManifestTypes = exports.ServerManifestTypes || (exports.ServerManifestTypes = {}));
 var BundleTargetTypes;
 (function (BundleTargetTypes) {

package/internal-do-not-import-from-here/models/ServerManifests.d.ts

@@ -4,7 +4,7 @@ import { IIcon } from '../../../fx-models/Icon';
 import { ServiceParam } from '../../../fx-models/ServiceParam';
 import { FeatureUIOption, IFeatureConfiguration } from '../../../fx-models/Feature';
 import { GuidValue } from "@omnia/fx-models";
-import { OmniaBackendRuntimes, OmniaRoleTypes } from "../../../fx-models/Enums";
+import { OmniaBackendRuntimes, OmniaRoleTypes, PersistentDiskTypes } from "../../../fx-models/Enums";
 import { AzureAdAppPermissionInfo, AzureAdAppResourceAccessWithAlternate } from "../../../fx-models/AzureAdAppPermissions";
 import { AzureAdAppPermissionOption } from "../AzureAdAppPermissionHelper";
 export interface ServiceFeatureOption {
@@ -98,6 +98,7 @@ export interface AppResourceType {
     icon: IIcon;
     parameters: Array<ServiceParam>;
     providedParameters: Array<ServiceParam>;
+    requiredFeatures?: Array<GuidValue>;
 }
 export interface ServiceAppDefinitionOption {
     title: string;
@@ -159,6 +160,7 @@ export interface ResourceOptionBase {
 export interface SqlResourceOption extends ResourceOptionBase {
 }
 export interface PersistentDiskResourceOption extends ResourceOptionBase {
+    type?: PersistentDiskTypes;
 }
 export interface SqlElasticPoolResourceOption extends ResourceOptionBase {
     elasticPoolId: GuidValue;
@@ -216,6 +218,9 @@ export interface ServiceBase extends ServiceOptions {
     serviceType: ServiceTypes;
     optionalService: boolean;
 }
+export interface CustomService extends ServiceBase {
+    hemlCommand?: string;
+}
 export interface ServiceManifest extends ServiceBase, ServerManifest {
 }
 export interface SecurityProviderIdentity {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@omnia/tooling-composers",
   "license": "MIT",
-  "version": "8.0.111-vnext",
+  "version": "8.0.113-vnext",
   "description": "Provide tooling to work with manifest things.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -19,8 +19,8 @@
   ],
   "author": "Precio Fishbone",
   "dependencies": {
-    "@omnia/fx-models": "8.0.111-vnext",
-    "@omnia/tooling": "8.0.111-vnext",
+    "@omnia/fx-models": "8.0.113-vnext",
+    "@omnia/tooling": "8.0.113-vnext",
     "deep-extend": "0.6.0",
     "fs-extra": "11.1.0",
     "del": "6.0.0",