Skip to content

Commit

Permalink
feat(artifacts): add ivy and maven expected artifact editors (#6241)
Browse files Browse the repository at this point in the history
  • Loading branch information
jkschneider authored Jan 3, 2019
1 parent 86baac9 commit 2c3e5df
Show file tree
Hide file tree
Showing 9 changed files with 136 additions and 1 deletion.
3 changes: 2 additions & 1 deletion app/scripts/modules/core/src/artifact/ArtifactIconService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export class ArtifactIconService {
if (type == null) {
return unknownArtifactPath;
}

const icon = ArtifactIconService.icons.find(entry => entry.type.test(type));
if (icon === undefined) {
return null;
Expand All @@ -36,3 +35,5 @@ ArtifactIconService.registerType(ArtifactTypePatterns.GITLAB_FILE, require('./ic
ArtifactIconService.registerType(ArtifactTypePatterns.BITBUCKET_FILE, require('./icons/bitbucket-file-artifact.svg'));
ArtifactIconService.registerType(ArtifactTypePatterns.S3_OBJECT, require('./icons/s3-object-artifact.svg'));
ArtifactIconService.registerType(ArtifactTypePatterns.HELM_CHART, require('./icons/helm-chart-artifact.svg'));
ArtifactIconService.registerType(ArtifactTypePatterns.IVY_FILE, require('./icons/ivy-artifact.svg'));
ArtifactIconService.registerType(ArtifactTypePatterns.MAVEN_FILE, require('./icons/maven-artifact.svg'));
2 changes: 2 additions & 0 deletions app/scripts/modules/core/src/artifact/ArtifactTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ export const ArtifactTypePatterns = {
KUBERNETES: /kubernetes\/(.*)/,
S3_OBJECT: /s3\/object/,
HELM_CHART: /helm\/chart/,
IVY_FILE: /ivy\/file/,
MAVEN_FILE: /maven\/file/,
};
13 changes: 13 additions & 0 deletions app/scripts/modules/core/src/artifact/icons/ivy-artifact.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions app/scripts/modules/core/src/artifact/icons/maven-artifact.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import { BASE64_ARTIFACT } from 'core/pipeline/config/triggers/artifacts/base64/
import { DEFAULT_BASE64_ARTIFACT } from 'core/pipeline/config/triggers/artifacts/base64/defaultBase64.artifact';
import { S3_ARTIFACT } from 'core/pipeline/config/triggers/artifacts/s3/s3.artifact';
import { DEFAULT_S3_ARTIFACT } from 'core/pipeline/config/triggers/artifacts/s3/defaultS3.artifact';
import { IVY_ARTIFACT } from 'core/pipeline/config/triggers/artifacts/ivy/ivy.artifact';
import { MAVEN_ARTIFACT } from 'core/pipeline/config/triggers/artifacts/maven/maven.artifact';

export const ARTIFACT_MODULE = 'spinnaker.core.pipeline.config.trigger.artifacts';

Expand All @@ -32,6 +34,8 @@ module(ARTIFACT_MODULE, [
DOCKER_ARTIFACT,
BASE64_ARTIFACT,
S3_ARTIFACT,
IVY_ARTIFACT,
MAVEN_ARTIFACT,
DEFAULT_S3_ARTIFACT,
DEFAULT_DOCKER_ARTIFACT,
DEFAULT_GCS_ARTIFACT,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { singleFieldArtifactEditor } from '../singleFieldArtifactEditor';

export const IvyArtifactEditor = singleFieldArtifactEditor('name', 'Coordinate', 'ivy-artifact', '');
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { IController, module } from 'angular';

import { IArtifact } from 'core/domain/IArtifact';
import { Registry } from 'core/registry';
import { IvyArtifactEditor } from './IvyArtifactEditor';

class IvyArtifactController implements IController {
constructor(public artifact: IArtifact) {
'ngInject';
}
}

export const IVY_ARTIFACT = 'spinnaker.core.pipeline.trigger.ivy.artifact';
module(IVY_ARTIFACT, [])
.config(() => {
Registry.pipeline.registerArtifactKind({
label: 'Ivy',
type: 'ivy/file',
description: 'An Ivy repository artifact.',
key: 'ivy',
isDefault: false,
isMatch: true,
controller: function(artifact: IArtifact) {
'ngInject';
this.artifact = artifact;
this.artifact.type = 'ivy/file';
},
controllerAs: 'ctrl',
editCmp: IvyArtifactEditor,
template: `
<div class="col-md-12">
<div class="form-group row">
<label class="col-md-2 sm-label-right">
Coordinate
</label>
<div class="col-md-8">
<input type="text"
placeholder="group:artifact:version"
class="form-control input-sm"
ng-model="ctrl.artifact.name" />
</div>
</div>
</div>
`,
});
})
.controller('ivyArtifactCtrl', IvyArtifactController);
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { singleFieldArtifactEditor } from '../singleFieldArtifactEditor';

export const MavenArtifactEditor = singleFieldArtifactEditor('name', 'Coordinate', 'maven-artifact', '');
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { IController, module } from 'angular';

import { IArtifact } from 'core/domain/IArtifact';
import { Registry } from 'core/registry';
import { MavenArtifactEditor } from './MavenArtifactEditor';

class MavenArtifactController implements IController {
constructor(public artifact: IArtifact) {
'ngInject';
}
}

export const MAVEN_ARTIFACT = 'spinnaker.core.pipeline.trigger.maven.artifact';
module(MAVEN_ARTIFACT, [])
.config(() => {
Registry.pipeline.registerArtifactKind({
label: 'Maven',
type: 'maven/file',
description: 'A Maven repository artifact.',
key: 'maven',
isDefault: false,
isMatch: true,
controller: function(artifact: IArtifact) {
'ngInject';
this.artifact = artifact;
this.artifact.type = 'maven/file';
},
controllerAs: 'ctrl',
editCmp: MavenArtifactEditor,
template: `
<div class="col-md-12">
<div class="form-group row">
<label class="col-md-2 sm-label-right">
Coordinate
</label>
<div class="col-md-8">
<input type="text"
placeholder="group:artifact:version"
class="form-control input-sm"
ng-model="ctrl.artifact.name" />
</div>
</div>
</div>
`,
});
})
.controller('mavenArtifactCtrl', MavenArtifactController);

0 comments on commit 2c3e5df

Please sign in to comment.