Skip to content

Commit

Permalink
Merge branch 'master' into container_builds
Browse files Browse the repository at this point in the history
  • Loading branch information
plumpy authored Feb 25, 2020
2 parents d291761 + f488ddf commit 207c6a1
Show file tree
Hide file tree
Showing 70 changed files with 3,345 additions and 1,873 deletions.
6 changes: 6 additions & 0 deletions .gcloudignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# By default, the .git directory (along with .gitignore and everything listed
# inside of it) does not get uploaded to Google Cloud Build. But the container
# builds fail if the git directory is missing. Adding this file overrides that
# behavior, but we'll still go ahead and exclude a few large cache directories.
.gradle
node_modules
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ on:
- release-*

env:
NODE_VERSION: 10.15.1
NODE_VERSION: 12.16.0

jobs:
ci:
# Meta-job that depends on the other job statuses. Branch protection then checks this job status.
name: Deck CI
needs: [test, build, packages]
needs: [test, build, functional-tests, packages]
runs-on: ubuntu-latest
steps:
- run: echo test, build, packages successful
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_amazon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Use Node.js 10.15.1
- name: Use Node.js 12.16.0
uses: actions/setup-node@v1
with:
node-version: 10.15.1
node-version: 12.16.0
- name: publish amazon
run: |
npm config set //registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_appengine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Use Node.js 10.15.1
- name: Use Node.js 12.16.0
uses: actions/setup-node@v1
with:
node-version: 10.15.1
node-version: 12.16.0
- name: publish appengine
run: |
npm config set //registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Use Node.js 10.15.1
- name: Use Node.js 12.16.0
uses: actions/setup-node@v1
with:
node-version: 10.15.1
node-version: 12.16.0
- name: publish azure
run: |
npm config set //registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_cloudfoundry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Use Node.js 10.15.1
- name: Use Node.js 12.16.0
uses: actions/setup-node@v1
with:
node-version: 10.15.1
node-version: 12.16.0
- name: publish cloudfoundry
run: |
npm config set //registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Use Node.js 10.15.1
- name: Use Node.js 12.16.0
uses: actions/setup-node@v1
with:
node-version: 10.15.1
node-version: 12.16.0
- name: publish core
run: |
npm config set //registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Use Node.js 10.15.1
- name: Use Node.js 12.16.0
uses: actions/setup-node@v1
with:
node-version: 10.15.1
node-version: 12.16.0
- name: publish docker
run: |
npm config set //registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Use Node.js 10.15.1
- name: Use Node.js 12.16.0
uses: actions/setup-node@v1
with:
node-version: 10.15.1
node-version: 12.16.0
- name: publish ecs
run: |
npm config set //registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_google.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Use Node.js 10.15.1
- name: Use Node.js 12.16.0
uses: actions/setup-node@v1
with:
node-version: 10.15.1
node-version: 12.16.0
- name: publish google
run: |
npm config set //registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_huaweicloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Use Node.js 10.15.1
- name: Use Node.js 12.16.0
uses: actions/setup-node@v1
with:
node-version: 10.15.1
node-version: 12.16.0
- name: publish huaweicloud
run: |
npm config set //registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_kubernetes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Use Node.js 10.15.1
- name: Use Node.js 12.16.0
uses: actions/setup-node@v1
with:
node-version: 10.15.1
node-version: 12.16.0
- name: publish kubernetes
run: |
npm config set //registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_oracle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Use Node.js 10.15.1
- name: Use Node.js 12.16.0
uses: actions/setup-node@v1
with:
node-version: 10.15.1
node-version: 12.16.0
- name: publish oracle
run: |
npm config set //registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_titus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Use Node.js 10.15.1
- name: Use Node.js 12.16.0
uses: actions/setup-node@v1
with:
node-version: 10.15.1
node-version: 12.16.0
- name: publish titus
run: |
npm config set //registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/modules/amazon/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spinnaker/amazon",
"version": "0.0.238",
"version": "0.0.239",
"main": "lib/lib.js",
"typings": "lib/index.d.ts",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/modules/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spinnaker/core",
"version": "0.0.448",
"version": "0.0.450",
"main": "lib/lib.js",
"typings": "lib/index.d.ts",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import {
ISearchResult,
DefaultSearchResultTab,
HeaderCell,
TableBody,
TableHeader,
TableRow,
SearchTableBody,
SearchTableHeader,
SearchTableRow,
ISearchColumn,
ISearchResultSet,
SearchResultType,
Expand Down Expand Up @@ -49,11 +49,11 @@ class ApplicationSearchResultType extends SearchResultType<IApplicationSearchRes
public TabComponent = DefaultSearchResultTab;

public HeaderComponent = () => (
<TableHeader>
<SearchTableHeader>
<HeaderCell col={this.cols.APPLICATION} />
<HeaderCell col={this.cols.ACCOUNT} />
<HeaderCell col={this.cols.EMAIL} />
</TableHeader>
</SearchTableHeader>
);

public DataComponent = ({ resultSet }: { resultSet: ISearchResultSet<IApplicationSearchResult> }) => {
Expand All @@ -63,15 +63,15 @@ class ApplicationSearchResultType extends SearchResultType<IApplicationSearchRes
const results = resultSet.results.slice().sort(itemSortFn);

return (
<TableBody>
<SearchTableBody>
{results.map(item => (
<TableRow key={itemKeyFn(item)}>
<SearchTableRow key={itemKeyFn(item)}>
<HrefCell item={item} col={this.cols.APPLICATION} />
<AccountCell item={item} col={this.cols.ACCOUNT} />
<BasicCell item={item} col={this.cols.EMAIL} />
</TableRow>
</SearchTableRow>
))}
</TableBody>
</SearchTableBody>
);
};

Expand Down
7 changes: 7 additions & 0 deletions app/scripts/modules/core/src/ci/igor.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,11 @@ export class IgorService {
.one('accounts')
.get();
}

public static getCodeBuildProjects(account: string): IPromise<string[]> {
return API.one('codebuild')
.one('projects')
.one(account)
.get();
}
}
18 changes: 9 additions & 9 deletions app/scripts/modules/core/src/cluster/clusterSearchResultType.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import {
DefaultSearchResultTab,
SearchStatus,
HeaderCell,
TableBody,
TableHeader,
TableRow,
SearchTableBody,
SearchTableHeader,
SearchTableRow,
ISearchResult,
SearchResultType,
ISearchResultSet,
Expand Down Expand Up @@ -45,10 +45,10 @@ class ClustersSearchResultType extends SearchResultType<IClusterSearchResult> {
public TabComponent = DefaultSearchResultTab;

public HeaderComponent = () => (
<TableHeader>
<SearchTableHeader>
<HeaderCell col={this.cols.CLUSTER} />
<HeaderCell col={this.cols.ACCOUNT} />
</TableHeader>
</SearchTableHeader>
);

public DataComponent = ({ resultSet }: { resultSet: ISearchResultSet<IClusterSearchResult> }) => {
Expand All @@ -57,14 +57,14 @@ class ClustersSearchResultType extends SearchResultType<IClusterSearchResult> {
const results = resultSet.results.slice().sort(itemSortFn);

return (
<TableBody>
<SearchTableBody>
{results.map(item => (
<TableRow key={itemKeyFn(item)}>
<SearchTableRow key={itemKeyFn(item)}>
<HrefCell item={item} col={this.cols.CLUSTER} />
<AccountCell item={item} col={this.cols.ACCOUNT} />
</TableRow>
</SearchTableRow>
))}
</TableBody>
</SearchTableBody>
);
};

Expand Down
3 changes: 2 additions & 1 deletion app/scripts/modules/core/src/core.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import { INSIGHT_MODULE } from './insight/insight.module';
import { INTERCEPTOR_MODULE } from './interceptor/interceptor.module';
import { LOAD_BALANCER_MODULE } from './loadBalancer/loadBalancer.module';
import { MANAGED_RESOURCE_CONFIG } from './application/config/managedResources/ManagedResourceConfig';
import { MANAGED_RESOURCES_DATA_SOURCE } from './managed';
import { MANAGED_RESOURCES_DATA_SOURCE, CORE_MANAGED_MANAGED_MODULE } from './managed';
import { FUNCTION_MODULE } from './function/function.module';

import { NETWORK_INTERCEPTOR } from './api/network.interceptor';
Expand Down Expand Up @@ -137,6 +137,7 @@ module(CORE_MODULE, [
FUNCTION_MODULE,
MANAGED_RESOURCE_CONFIG,
MANAGED_RESOURCES_DATA_SOURCE,
CORE_MANAGED_MANAGED_MODULE,
CORE_MODAL_MODAL_MODULE,

NETWORK_INTERCEPTOR,
Expand Down
1 change: 1 addition & 0 deletions app/scripts/modules/core/src/domain/IPipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export interface IPipeline {
};
type?: string;
updateTs?: number;
spelEvaluator?: string;
}

export interface IPipelineManualStartAlert {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import {
DefaultSearchResultTab,
ISearchResult,
HeaderCell,
TableBody,
TableHeader,
TableRow,
SearchTableBody,
SearchTableHeader,
SearchTableRow,
ISearchColumn,
SearchResultType,
ISearchResultSet,
Expand Down Expand Up @@ -45,12 +45,12 @@ class InstancesSearchResultType extends SearchResultType<IInstanceSearchResult>
public TabComponent = DefaultSearchResultTab;

public HeaderComponent = () => (
<TableHeader>
<SearchTableHeader>
<HeaderCell col={this.cols.INSTANCE} />
<HeaderCell col={this.cols.ACCOUNT} />
<HeaderCell col={this.cols.REGION} />
<HeaderCell col={this.cols.SERVERGROUP} />
</TableHeader>
</SearchTableHeader>
);

public DataComponent = ({ resultSet }: { resultSet: ISearchResultSet<IInstanceSearchResult> }) => {
Expand All @@ -60,19 +60,19 @@ class InstancesSearchResultType extends SearchResultType<IInstanceSearchResult>
const results = resultSet.results.slice().sort(itemSortFn);

return (
<TableBody>
<SearchTableBody>
{results
.slice()
.sort(itemSortFn)
.map(item => (
<TableRow key={itemKeyFn(item)}>
<SearchTableRow key={itemKeyFn(item)}>
<HrefCell item={item} col={this.cols.INSTANCE} />
<AccountCell item={item} col={this.cols.ACCOUNT} />
<BasicCell item={item} col={this.cols.REGION} />
<BasicCell item={item} col={this.cols.SERVERGROUP} defaultValue="Standalone Instance" />
</TableRow>
</SearchTableRow>
))}
</TableBody>
</SearchTableBody>
);
};

Expand Down
Loading

0 comments on commit 207c6a1

Please sign in to comment.