Skip to content

Commit

Permalink
upgrade deck
Browse files Browse the repository at this point in the history
  • Loading branch information
yejingtao committed Jan 29, 2021
1 parent f6696f5 commit f20c9f1
Show file tree
Hide file tree
Showing 29 changed files with 40 additions and 17 deletions.
1 change: 1 addition & 0 deletions app/scripts/modules/alicloud/src/alicloud.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,4 @@ module(ALICLOUD_MODULE, [
});

DeploymentStrategyRegistry.registerProvider('alicloud', ['custom', 'redblack', 'rollingpush', 'rollingredblack']);

Original file line number Diff line number Diff line change
Expand Up @@ -267,3 +267,4 @@ angular
};
},
]);

Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ describe('Service: alicloudServerGroupConfiguration', function() {

expect(this.command.backingData.filtered.securityGroups).toEqual(expected);
expect(result).toEqual({ dirty: { securityGroups: true } });
expect(this.command.viewState.securityGroupConfigured).toBeTrue ;
// expect(this.command.viewState.securityGroupConfigured).toBeTrue ;
});

it('finds matching firewalls, sets dirty flag for subsequent time', function() {
Expand All @@ -129,7 +129,7 @@ describe('Service: alicloudServerGroupConfiguration', function() {

expect(this.command.backingData.filtered.securityGroups).toEqual(expected);
expect(result).toEqual({ dirty: { securityGroups: true } });
expect(this.command.viewState.securityGroupConfigured).toBeTrue;
// expect(this.command.viewState.securityGroupConfigured).toBeTrue;
});

it('clears the selected securityGroup', function() {
Expand Down Expand Up @@ -159,10 +159,10 @@ describe('Service: alicloudServerGroupConfiguration', function() {

const result = service.configureSecurityGroupOptions(this.command);

//expect (this.command.selectedSecurityGroup).toBeUndefined;
// expect (this.command.selectedSecurityGroup).toBeUndefined;
expect(result).toEqual({ dirty: { securityGroups: true } });
expect(this.command.backingData.filtered.securityGroups).toEqual([]);
// expect(this.command.viewState.securityGroupConfigured).toBeFalse;
// expect(this.command.viewState.securityGroupConfigured).toBeFalse;
});

it('returns empty zone list if region is not supported', function() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ angular
result.dirty.securityGroups = true;
}
if (currentOptions !== newRegionalSecurityGroups) {
// command.backingData.filtered.securityGroups = newRegionalSecurityGroups;
command.backingData.filtered.securityGroups = newRegionalSecurityGroups;
result.dirty.securityGroups = true;
}

Expand All @@ -173,7 +173,7 @@ angular
function refreshSecurityGroups(command: any, skipCommandReconfiguration: any) {
return cacheInitializer.refreshCache('securityGroups').then(function() {
return securityGroupReader.getAllSecurityGroups().then(function(securityGroups: any) {
// command.backingData.securityGroups = securityGroups;
command.backingData.securityGroups = securityGroups;
if (!skipCommandReconfiguration) {
configureSecurityGroupOptions(command);
}
Expand Down Expand Up @@ -204,13 +204,13 @@ angular
result.dirty.loadBalancers = removed;
}
}
// command.backingData.filtered.loadBalancers = newLoadBalancers;
command.backingData.filtered.loadBalancers = newLoadBalancers;
return result;
}

function refreshLoadBalancers(command: any, skipCommandReconfiguration: any) {
return loadBalancerReader.listLoadBalancers('alicloud').then(function(loadBalancers: any) {
// command.backingData.loadBalancers = loadBalancers;
command.backingData.loadBalancers = loadBalancers;
if (!skipCommandReconfiguration) {
configureLoadBalancerOptions(command);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="form-horizontal">
i<div class="form-horizontal">
<div class="form-group">
<!--<div class="form-group">-->
<!--<div class="col-md-4 sm-label-right">Number of Instances</div>-->
Expand Down Expand Up @@ -37,3 +37,4 @@
</div>
</div>
</div>

Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,4 @@ angular
};
},
]);

Original file line number Diff line number Diff line change
Expand Up @@ -235,3 +235,4 @@ <h5 class="text-center">
</ng-form>
</div>
</div>

Original file line number Diff line number Diff line change
Expand Up @@ -147,3 +147,4 @@ angular
};
},
]);

Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,4 @@ <h5 class="text-center" ng-if="!command.viewState.loadBalancersConfigured || com
</div>
</div>
</div>

Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,4 @@ angular
};
},
]);

Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,4 @@
</div>
</div>
</div>

Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,4 @@ <h5 ng-show="command.vSwitchIds==null" class="text-center col-md-7">(please sele
</div>
</div>
</div>

Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,4 @@ angular
};
},
]);

Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,4 @@ <h3>Resize {{serverGroup.name}}</h3>
></alicloud-footer>
</form>
</div>

Original file line number Diff line number Diff line change
Expand Up @@ -374,3 +374,4 @@ angular
};
},
]);

Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ module.exports = angular
AppNotificationsService.getNotificationsForApplication($scope.application).then(function(notifications) {
$scope.notifications = _.filter(
_.flatten(
_.map(['email', 'bearychat', 'googlechat', 'sms', 'hipchat', 'slack', 'githubstatus', 'pubsub','youdu'], function(
_.map(['email', 'youdu', 'bearychat', 'googlechat', 'sms', 'hipchat', 'slack', 'githubstatus', 'pubsub'], function(
type,
) {
if (notifications[type]) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@
</div>
</div>
</ng-form>

Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
</div>
</div>
</ng-form>

Original file line number Diff line number Diff line change
Expand Up @@ -246,3 +246,4 @@ module.exports = angular
}
},
]);

Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ module.exports = angular.module('spinnaker.core.pipeline.stage.findImageFromName
description: 'Finds an image to deploy from existing name',
});
});

Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ module.exports = angular.module('spinnaker.core.pipeline.stage.findImageFromName
STAGE_COMMON_MODULE,
require('./findImageFromNameStage').name,
]);

Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ export class StageConstants {
},
];
}

1 change: 1 addition & 0 deletions app/scripts/modules/core/src/pipeline/pipeline.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,4 @@ module(PIPELINE_MODULE, [
require('./config/preconditions/types/expression/expression.precondition.type.module').name,
PIPELINE_TEMPLATES_V2_STATES_CONFIG,
]);

1 change: 1 addition & 0 deletions app/scripts/modules/tencent/src/aws.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,4 @@ module(TENCENT_MODULE, [
});

DeploymentStrategyRegistry.registerProvider('tencent', ['custom', 'redblack', 'rollingpush', 'rollingredblack']);

Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ <h4>Results</h4>
</div>
</div>
</div>

Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
<input type="text" class="form-control input-sm" ng-model="stage.imageName" />
</stage-config-field>
</div>

Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ module.exports = angular
});
},
]);

Original file line number Diff line number Diff line change
Expand Up @@ -437,3 +437,4 @@ export class ServerGroupLoadBalancers
);
}
}

12 changes: 6 additions & 6 deletions settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ var artifactsEnabled = process.env.ARTIFACTS_ENABLED === 'true';
var artifactsRewriteEnabled = process.env.ARTIFACTS_REWRITE_ENABLED === 'true';
var atlasWebComponentsUrl = process.env.ATLAS_WEB_COMPONENTS_URL;
var authEndpoint = process.env.AUTH_ENDPOINT || apiHost + '/auth/user';
var authEnabled = false;
var authEnabled = true;
var bakeryDetailUrl =
process.env.BAKERY_DETAIL_URL || apiHost + '/bakery/logs/{{context.region}}/{{context.status.resourceId}}';
var canaryAccount = process.env.CANARY_ACCOUNT || '';
var canaryEnabled = process.env.CANARY_ENABLED === 'true';
var canaryFeatureDisabled = process.env.CANARY_FEATURE_ENABLED !== 'true';
var canaryStagesEnabled = process.env.CANARY_STAGES_ENABLED === 'true';
var canaryEnabled = 'true' === 'true';
var canaryFeatureDisabled = 'true' !== 'true';
var canaryStagesEnabled = 'true' === 'true';
var chaosEnabled = process.env.CHAOS_ENABLED === 'true' ? true : false;
var debugEnabled = process.env.DEBUG_ENABLED === 'false' ? false : true;
var defaultMetricStore = process.env.METRIC_STORE || 'atlas';
var displayTimestampsInUserLocalTime = process.env.DISPLAY_TIMESTAMPS_IN_USER_LOCAL_TIME === 'true';
var dryRunEnabled = process.env.DRYRUN_ENABLED === 'true' ? true : false;
var entityTagsEnabled = process.env.ENTITY_TAGS_ENABLED === 'true' ? true : false;
var fiatEnabled = process.env.FIAT_ENABLED === 'true' ? true : false;
var fiatEnabled = 'true' === 'true';
var gremlinEnabled = process.env.GREMLIN_ENABLED === 'false' ? false : true;
var iapRefresherEnabled = process.env.IAP_REFRESHER_ENABLED === 'true' ? true : false;
var infrastructureEnabled = process.env.INFRA_ENABLED === 'true' ? true : false;
Expand Down Expand Up @@ -53,8 +53,8 @@ window.spinnakerSettings = {
defaultProviders: [
'appengine',
'aws',
'alicloud',
'azure',
'alicloud',
'cloudfoundry',
'dcos',
'ecs',
Expand Down

0 comments on commit f20c9f1

Please sign in to comment.