Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(eslint): eslint --fix api-no-slashes #8631

Merged
merged 2 commits into from
Oct 7, 2020
Merged

chore(eslint): eslint --fix api-no-slashes #8631

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02b1b5b
chore(eslint): eslint --fix api-no-slashes
christopherthielen Oct 6, 2020
9b636a6
Merge branch 'master' into api-no-slashes
mergify[bot] Oct 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/scripts/modules/amazon/src/image/image.reader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export class AwsImageReader {
return $q.when([{ message: 'Please enter at least 3 characters...', disabled: true }]) as any;
}

return API.one('images/find')
return API.one('images', 'find')
.withParams(params)
.get()
.catch(() => [] as IAmazonImage[]);
Expand Down
12 changes: 6 additions & 6 deletions app/scripts/modules/azure/src/image/image.reader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import { API } from '@spinnaker/core';

export const AZURE_IMAGE_IMAGE_READER = 'spinnaker.azure.image.reader';
export const name = AZURE_IMAGE_IMAGE_READER; // for backwards compatibility
module(AZURE_IMAGE_IMAGE_READER, []).factory('azureImageReader', function() {
module(AZURE_IMAGE_IMAGE_READER, []).factory('azureImageReader', function () {
function findImages(params) {
return API.one('images/find')
return API.one('images', 'find')
.get(params)
.then(
function(results) {
function (results) {
return results;
},
function() {
function () {
return [];
},
);
Expand All @@ -28,10 +28,10 @@ module(AZURE_IMAGE_IMAGE_READER, []).factory('azureImageReader', function() {
.withParams({ provider: 'azure' })
.get()
.then(
function(results) {
function (results) {
return results && results.length ? results[0] : null;
},
function() {
function () {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔 Is this because of a new version of prettier?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so. I have noticed this and some mods to one param arrow functions as well.

return null;
},
);
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/modules/cloudfoundry/src/image/image.reader.cf.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import { ICloudFoundryCluster } from 'cloudfoundry/domain';

export class CloudFoundryImageReader {
public static findImages(account: string): IPromise<ICloudFoundryCluster[]> {
return API.one('images/find')
return API.one('images', 'find')
.withParams({
account,
provider: 'cloudfoundry',
})
.get()
.then(function(results: any) {
.then(function (results: any) {
return results;
})
.catch((): any[] => []);
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/modules/core/src/pagerDuty/pagerDuty.read.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ export interface IOnCall {

export class PagerDutyReader {
public static listServices(): Observable<IPagerDutyService[]> {
return Observable.fromPromise(API.one('pagerDuty/services').getList());
return Observable.fromPromise(API.one('pagerDuty', 'services').getList());
}

public static listOnCalls(): Observable<{ [id: string]: IOnCall[] }> {
return Observable.fromPromise(API.one('pagerDuty/oncalls').getList());
return Observable.fromPromise(API.one('pagerDuty', 'oncalls').getList());
}
}
16 changes: 8 additions & 8 deletions app/scripts/modules/core/src/pipeline/config/stages/gremlin/GremlinStageConfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class GremlinStageConfig extends React.Component<IStageConfigProps> {

private fetchCommands = (apiKey: string) => {
return Observable.fromPromise(
API.one('integrations/gremlin/templates/command')
API.one('integrations', 'gremlin', 'templates', 'command')
.post({
apiKey,
})
Expand All @@ -61,7 +61,7 @@ export class GremlinStageConfig extends React.Component<IStageConfigProps> {

private fetchTargets = (apiKey: string) => {
return Observable.fromPromise(
API.one('integrations/gremlin/templates/target')
API.one('integrations', 'gremlin', 'templates', 'target')
.post({
apiKey,
})
Expand All @@ -88,7 +88,7 @@ export class GremlinStageConfig extends React.Component<IStageConfigProps> {
});

// Get the data from all the necessary sources before rendering
Observable.forkJoin(this.fetchCommands(gremlinApiKey), this.fetchTargets(gremlinApiKey)).subscribe(results => {
Observable.forkJoin(this.fetchCommands(gremlinApiKey), this.fetchTargets(gremlinApiKey)).subscribe((results) => {
const newState: IState = {
isFetchingData: false,
};
Expand Down Expand Up @@ -125,11 +125,11 @@ export class GremlinStageConfig extends React.Component<IStageConfigProps> {
// Provides access to meta information for summary box
const selectedCommandTemplateMeta =
commands.length && stage.gremlinCommandTemplateId
? commands.find(command => command.guid === stage.gremlinCommandTemplateId)
? commands.find((command) => command.guid === stage.gremlinCommandTemplateId)
: {};
const selectedTargetTemplateMeta =
targets.length && stage.gremlinTargetTemplateId
? targets.find(target => target.guid === stage.gremlinTargetTemplateId)
? targets.find((target) => target.guid === stage.gremlinTargetTemplateId)
: {};

return (
Expand All @@ -141,7 +141,7 @@ export class GremlinStageConfig extends React.Component<IStageConfigProps> {
className="form-control input"
type="text"
value={stage.gremlinApiKey || ''}
onChange={e => this.onChange(e.target.name, e.target.value)}
onChange={(e) => this.onChange(e.target.name, e.target.value)}
/>
<div className="form-control-static" style={{ paddingBottom: 0 }}>
<div className="flex-container-h middle margin-between-md">
Expand Down Expand Up @@ -177,7 +177,7 @@ export class GremlinStageConfig extends React.Component<IStageConfigProps> {
) : (
<Select
name="gremlinTargetTemplateId"
options={targets.map(target => ({
options={targets.map((target) => ({
label: target.name,
value: target.guid,
}))}
Expand All @@ -197,7 +197,7 @@ export class GremlinStageConfig extends React.Component<IStageConfigProps> {
) : (
<Select
name="gremlinCommandTemplateId"
options={commands.map(command => ({
options={commands.map((command) => ({
label: command.name,
value: command.guid,
}))}
Expand Down
16 changes: 8 additions & 8 deletions app/scripts/modules/core/src/plugins/plugin.registry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class PluginRegistry {

registerPluginMetaData(source: ISource, pluginMetaData: IPluginMetaData): INormalizedPluginMetaData | undefined {
const metaData = this.normalize(source, pluginMetaData);
const duplicateMetaData = this.pluginManifests.find(x => x.id === metaData.id);
const duplicateMetaData = this.pluginManifests.find((x) => x.id === metaData.id);

// Handle duplicate plugin ids
if (duplicateMetaData) {
Expand All @@ -45,7 +45,7 @@ export class PluginRegistry {
// eslint-disable-next-line no-console
console.log(`Attempted to load plugin ${pluginMetaData.id} from gate and deck. Using plugin from deck.`);
if (source === 'deck') {
this.pluginManifests = this.pluginManifests.filter(x => x !== duplicateMetaData);
this.pluginManifests = this.pluginManifests.filter((x) => x !== duplicateMetaData);
} else if (source === 'gate') {
return undefined;
}
Expand Down Expand Up @@ -74,7 +74,7 @@ export class PluginRegistry {
throw new Error(`Invalid plugin manifest: received ${pluginMetaData} object`);
}
const keys: Array<keyof IPluginMetaData> = ['id', 'version'];
const missingKeys = keys.filter(key => !pluginMetaData[key]);
const missingKeys = keys.filter((key) => !pluginMetaData[key]);
if (missingKeys.length) {
throw new Error(`Invalid plugin manifest: Required key is missing: '${missingKeys.join(', ')}'`);
}
Expand All @@ -85,7 +85,7 @@ export class PluginRegistry {
const source = 'deck';
const uri = '/plugin-manifest.json';
const loadPromise = Promise.resolve($http.get<IPluginMetaData[]>(uri))
.then(response => response.data)
.then((response) => response.data)
.catch((error: any) => {
console.error(`Failed to load ${uri} from ${source}`);
throw error;
Expand All @@ -97,8 +97,8 @@ export class PluginRegistry {
/** Loads plugin manifest file served from gate */
public loadPluginManifestFromGate() {
const source = 'gate';
const uri = '/plugins/deck/plugin-manifest.json';
const loadPromise = API.one(uri)
const uri = 'plugins/deck/plugin-manifest.json';
const loadPromise = API.one(...uri.split('/'))
.get()
.catch((error: any) => {
console.error(`Failed to load ${uri} from ${source}`);
Expand Down Expand Up @@ -126,15 +126,15 @@ export class PluginRegistry {
): Promise<IPluginMetaData[]> {
try {
const plugins = await pluginsMetaDataPromise;
return plugins.map(pluginMetaData => this.registerPluginMetaData(source, pluginMetaData));
return plugins.map((pluginMetaData) => this.registerPluginMetaData(source, pluginMetaData));
} catch (error) {
console.error(`Error loading plugin manifest from ${location}`);
throw error;
}
}

public loadPlugins(): Promise<any[]> {
return Promise.all(this.pluginManifests.map(plugin => this.load(plugin)));
return Promise.all(this.pluginManifests.map((plugin) => this.load(plugin)));
}

private async load(pluginMetaData: IPluginMetaData) {
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/modules/core/src/slack/SlackReader.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ describe('SlackReader', () => {
await SlackReader.getChannels().then((channels: ISlackChannel[]) => {
expect(SlackReader.getChannels).toHaveBeenCalled();
expect(channels.length).toEqual(2);
expect(API.one).toHaveBeenCalledWith('slack/channels');
expect(API.one).toHaveBeenCalledWith('slack', 'channels');
});
});
});
2 changes: 1 addition & 1 deletion app/scripts/modules/core/src/slack/SlackReader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export interface ISlackChannel {

export class SlackReader {
public static getChannels(): IPromise<ISlackChannel[]> {
return API.one('slack/channels')
return API.one('slack', 'channels')
.getList()
.catch(() => [] as ISlackChannel[]);
}
Expand Down
8 changes: 4 additions & 4 deletions app/scripts/modules/dcos/image/image.reader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import { module } from 'angular';

export const DCOS_IMAGE_IMAGE_READER = 'spinnaker.dcos.image.reader';
export const name = DCOS_IMAGE_IMAGE_READER; // for backwards compatibility
module(DCOS_IMAGE_IMAGE_READER, []).factory('dcosImageReader', function() {
module(DCOS_IMAGE_IMAGE_READER, []).factory('dcosImageReader', function () {
function findImages(params) {
return API.all('images/find')
return API.all('images', 'find')
.getList(params)
.then(
function(results) {
function (results) {
return results;
},
function() {
function () {
return [];
},
);
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/modules/docker/src/image/DockerImageReader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class DockerImageReader {

public static findImages(params: IFindImageParams): IPromise<IDockerImage[]> {
return RetryService.buildRetrySequence<IDockerImage[]>(
() => API.all('images/find').getList(params),
() => API.all('images', 'find').getList(params),
(results: IDockerImage[]) => results.length > 0,
10,
1000,
Expand All @@ -34,7 +34,7 @@ export class DockerImageReader {

public static findTags(params: IFindTagsParams): IPromise<string[]> {
return RetryService.buildRetrySequence<string[]>(
() => API.all('images/tags').getList(params),
() => API.all('images', 'tags').getList(params),
(results: string[]) => results.length > 0,
10,
1000,
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/modules/google/src/image/image.reader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export interface IGceImage {

export class GceImageReader {
public static findImages(params: { account?: string; provider?: string; q?: string }): IPromise<IGceImage[]> {
return API.one('images/find')
return API.one('images', 'find')
.withParams(params)
.get()
.catch(() => [] as IGceImage[]);
Expand Down
10 changes: 5 additions & 5 deletions app/scripts/modules/oracle/src/image/image.reader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import { API } from '@spinnaker/core';

export const ORACLE_IMAGE_IMAGE_READER = 'spinnaker.oracle.image.reader';
export const name = ORACLE_IMAGE_IMAGE_READER; // for backwards compatibility
module(ORACLE_IMAGE_IMAGE_READER, []).factory('oracleImageReader', function() {
module(ORACLE_IMAGE_IMAGE_READER, []).factory('oracleImageReader', function () {
function findImages(params) {
return API.one('images/find')
return API.one('images', 'find')
.withParams(params)
.get()
.catch(function() {
.catch(function () {
return [];
});
}
Expand All @@ -24,10 +24,10 @@ module(ORACLE_IMAGE_IMAGE_READER, []).factory('oracleImageReader', function() {
.withParams({ provider: 'oracle' })
.get()
.then(
function(results) {
function (results) {
return results && results.length ? results[0] : null;
},
function() {
function () {
return null;
},
);
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/modules/tencentcloud/src/image/image.reader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export class TencentcloudImageReader {
return $q.when([{ message: 'Please enter at least 3 characters...', disabled: true }]) as any;
}

return API.one('images/find')
return API.one('images', 'find')
.withParams({ ...params, provider: 'tencentcloud' })
.get()
.catch(() => [] as ITencentcloudImage[]);
Expand Down