gcloud app deploy will be run.`,
},
{
@@ -34,15 +34,15 @@ module(APPENGINE_HELP_CONTENTS_REGISTRY, [HELP_CONTENTS_REGISTRY])
},
{
key: 'appengine.serverGroup.configFiles',
- value: `(Optional) The contents of an App Engine config file (e.g., an app.yaml or
- cron.yaml file). These files should not conflict with the config filepaths above:
+ value: `
(Optional) The contents of an App Engine config file (e.g., an app.yaml or
+ cron.yaml file). These files should not conflict with the config filepaths above:
if you include, for example, the contents of an app.yaml
file here, you should not specify the file path to an app.yaml above.
If this is a pipeline stage, you can use Spinnaker Pipeline Expressions here.
`, }, { key: 'appengine.serverGroup.matchBranchOnRegex', - value: `(Optional) A Jenkins trigger may produce details from multiple repositories and branches. + value: `(Optional) A Jenkins trigger may produce details from multiple repositories and branches. Spinnaker will use the regex specified here to help resolve a branch for the deployment. If Spinnaker cannot resolve exactly one branch from the trigger, this pipeline will fail.`, }, @@ -66,9 +66,9 @@ module(APPENGINE_HELP_CONTENTS_REGISTRY, [HELP_CONTENTS_REGISTRY]) }, { key: 'appengine.loadBalancer.migrateTraffic', - value: `If selected, traffic will be gradually shifted to a single version. For gradual traffic migration, - the target version must be located within instances that are configured for - both warmup requests and automatic scaling. + value: `If selected, traffic will be gradually shifted to a single version. For gradual traffic migration, + the target version must be located within instances that are configured for + both warmup requests and automatic scaling. Gradual traffic migration is not supported in the App Engine flexible environment.` }, { @@ -77,7 +77,7 @@ module(APPENGINE_HELP_CONTENTS_REGISTRY, [HELP_CONTENTS_REGISTRY]) }, { key: 'appengine.loadBalancer.textLocator', - value: `Either the name of a server group, or a Spinnaker Pipeline Expression + value: `Either the name of a server group, or a Spinnaker Pipeline Expression that resolves to the name of a server group.` }, { @@ -87,8 +87,8 @@ module(APPENGINE_HELP_CONTENTS_REGISTRY, [HELP_CONTENTS_REGISTRY])Deleting ${this.loadBalancer.name} will destroy the following server groups:
- Enabling ${this.serverGroup.name} will set its traffic allocation for + Enabling ${this.serverGroup.name} will set its traffic allocation for ${this.serverGroup.loadBalancers[0]} to 100%.
If you would like more fine-grained control over your server groups' allocations, edit ${this.serverGroup.loadBalancers[0]} under the Load Balancers tab. -
+Optional; you can use the wildcard (*) to include all stacks (including no stack). + contents: `
Optional; you can use the wildcard (*) to include all stacks (including no stack). To apply the guard only to a cluster without a stack, leave this field blank.
` }, { key: 'trafficGuard.detail', - contents: `Optional; you can use the wildcard (*) to include all stacks (including no detail). + contents: `
Optional; you can use the wildcard (*) to include all stacks (including no detail). To apply the guard only to a cluster without a detail, leave this field blank.
` }, ]; diff --git a/app/scripts/modules/core/application/nav/secondaryNav.component.ts b/app/scripts/modules/core/application/nav/secondaryNav.component.ts index bd2e786b4f9..938df3ae376 100644 --- a/app/scripts/modules/core/application/nav/secondaryNav.component.ts +++ b/app/scripts/modules/core/application/nav/secondaryNav.component.ts @@ -35,8 +35,8 @@ class SecondaryApplicationNavComponent implements IComponentOptions { ng-class="{active: $ctrl.isActive(dataSource)}"> {{dataSource.label}} -Alerts indicate an issue with a server group. When present, an alert icon + contents: `
Alerts indicate an issue with a server group. When present, an alert icon will be displayed in the clusters view next to the server group.
` }, { key: 'entityTags.serverGroup.notice', - contents: `Notices provide additional context for a server group. When present, an info icon + contents: `
Notices provide additional context for a server group. When present, an info icon will be displayed in the clusters view next to the server group.
` }, { key: 'entityTags.loadBalancer.alert', - contents: `Alerts indicate an issue with a load balancer. When present, an alert icon + contents: `
Alerts indicate an issue with a load balancer. When present, an alert icon will be displayed in the load balancers view next to the server group.
` }, { key: 'entityTags.loadBalancer.notice', - contents: `Notices provide additional context for a load balancer. When present, an info icon + contents: `
Notices provide additional context for a load balancer. When present, an info icon will be displayed in the load balancers view next to the server group.
` }, { key: 'entityTags.securityGroup.notice', - contents: `Notices provide additional context for a security group. When present, an info icon + contents: `
Notices provide additional context for a security group. When present, an info icon will be displayed in the security groups view next to the security group.
` }, { key: 'entityTags.securityGroup.alert', - contents: `Alerts indicate an issue with a security group. When present, an alert icon + contents: `
Alerts indicate an issue with a security group. When present, an alert icon will be displayed in the security groups view next to the security group.
` } ]; diff --git a/app/scripts/modules/core/entityTag/entityUiTags.component.ts b/app/scripts/modules/core/entityTag/entityUiTags.component.ts index 359bc8d1420..b94f061eb5f 100644 --- a/app/scripts/modules/core/entityTag/entityUiTags.component.ts +++ b/app/scripts/modules/core/entityTag/entityUiTags.component.ts @@ -149,8 +149,8 @@ class EntityUiTagsComponent implements ng.IComponentOptions { public template = ` diff --git a/app/scripts/modules/core/pipeline/config/validation/pipelineConfig.validator.ts b/app/scripts/modules/core/pipeline/config/validation/pipelineConfig.validator.ts index eb629831e9f..fc5f8cf484b 100644 --- a/app/scripts/modules/core/pipeline/config/validation/pipelineConfig.validator.ts +++ b/app/scripts/modules/core/pipeline/config/validation/pipelineConfig.validator.ts @@ -24,15 +24,6 @@ export interface IValidatorConfig { preventSave?: boolean; } -export interface ITriggerTypeConfig extends IStageOrTriggerTypeConfig { - manualExecutionHandler?: string; -} - -export interface IStageTypeConfig extends IStageOrTriggerTypeConfig { - executionDetailsUrl: string; - defaultTimeoutMs?: number; -} - export interface IStageOrTriggerTypeConfig { label: string; description: string; @@ -44,6 +35,15 @@ export interface IStageOrTriggerTypeConfig { validators: IValidatorConfig[]; } +export interface ITriggerTypeConfig extends IStageOrTriggerTypeConfig { + manualExecutionHandler?: string; +} + +export interface IStageTypeConfig extends IStageOrTriggerTypeConfig { + executionDetailsUrl: string; + defaultTimeoutMs?: number; +} + export interface IStageOrTriggerValidator { validate(pipeline: IPipeline, stageOrTrigger: IStage | ITrigger, diff --git a/app/scripts/modules/core/presentation/navigation/pageNavigator.component.ts b/app/scripts/modules/core/presentation/navigation/pageNavigator.component.ts index 055039eb21f..211cf252a81 100644 --- a/app/scripts/modules/core/presentation/navigation/pageNavigator.component.ts +++ b/app/scripts/modules/core/presentation/navigation/pageNavigator.component.ts @@ -79,10 +79,10 @@ class PageNavigatorComponent implements ng.IComponentOptions {This will reduce the cluster to ${activePercentRemaining} percent of its current capacity, leaving ${activeInstancesAfterDisable} instance${activeInstancesAfterDisable === 1 ? '' : 's'} taking diff --git a/app/scripts/modules/core/utils/clipboard/copyToClipboard.component.ts b/app/scripts/modules/core/utils/clipboard/copyToClipboard.component.ts index 53dfbaabb2c..04197a42eb0 100644 --- a/app/scripts/modules/core/utils/clipboard/copyToClipboard.component.ts +++ b/app/scripts/modules/core/utils/clipboard/copyToClipboard.component.ts @@ -18,6 +18,7 @@ export class CopyToClipboardController implements IComponentController { private $timeout: ITimeoutService) {} public $onInit(): void { + // tslint:disable:no-unused-expression new Clipboard('.clipboard-btn'); this.$element.on('click', () => { this.isOpen = true; diff --git a/app/scripts/modules/google/loadBalancer/configure/http/templates.ts b/app/scripts/modules/google/loadBalancer/configure/http/templates.ts index 15159aa389d..dddaa2a10ec 100644 --- a/app/scripts/modules/google/loadBalancer/configure/http/templates.ts +++ b/app/scripts/modules/google/loadBalancer/configure/http/templates.ts @@ -28,15 +28,15 @@ export class HealthCheckTemplate { public unhealthyThreshold = 2; } +export class PathMatcherTemplate { + public pathRules: PathRuleTemplate[] = []; +} + export class HostRuleTemplate { public hostPatterns: string[]; public pathMatcher: PathMatcherTemplate = new PathMatcherTemplate(); } -export class PathMatcherTemplate { - public pathRules: PathRuleTemplate[] = []; -} - export class PathRuleTemplate { public paths: string[]; } diff --git a/app/scripts/modules/google/serverGroup/details/autoHealingPolicy/autoHealingPolicy.component.ts b/app/scripts/modules/google/serverGroup/details/autoHealingPolicy/autoHealingPolicy.component.ts index 2e7910cbe75..24a206daaf2 100644 --- a/app/scripts/modules/google/serverGroup/details/autoHealingPolicy/autoHealingPolicy.component.ts +++ b/app/scripts/modules/google/serverGroup/details/autoHealingPolicy/autoHealingPolicy.component.ts @@ -44,7 +44,7 @@ class GceAutoHealingPolicyDetailsCtrl implements ng.IComponentController { class GceAutoHealingPolicyDetails implements ng.IComponentOptions { public bindings: any = {serverGroup: '<', application: '<'}; - public template = ` + public template = `