Skip to content

Commit

Permalink
Revert "feat(provider/aws): Functions (listing and searching) (#7536)" (
Browse files Browse the repository at this point in the history
#7567)

This reverts commit 86a365b.
  • Loading branch information
plumpy authored and mergify[bot] committed Oct 25, 2019
1 parent 713c289 commit e49ffaf
Show file tree
Hide file tree
Showing 29 changed files with 6 additions and 1,195 deletions.
7 changes: 1 addition & 6 deletions app/scripts/modules/amazon/src/aws.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { module } from 'angular';
import { CloudProviderRegistry, DeploymentStrategyRegistry } from '@spinnaker/core';

import { AWS_LOAD_BALANCER_MODULE } from './loadBalancer/loadBalancer.module';
import { AWS_FUNCTION_MODULE } from './function/function.module';
import { AWS_REACT_MODULE } from './reactShims/aws.react.module';
import { AWS_SECURITY_GROUP_MODULE } from './securityGroup/securityGroup.module';
import { AWS_SERVER_GROUP_TRANSFORMER } from './serverGroup/serverGroup.transformer';
Expand All @@ -18,7 +17,7 @@ import { AwsImageReader } from './image';
import { AmazonLoadBalancerClusterContainer } from './loadBalancer/AmazonLoadBalancerClusterContainer';
import { AmazonLoadBalancersTag } from './loadBalancer/AmazonLoadBalancersTag';
import { AwsLoadBalancerTransformer } from './loadBalancer/loadBalancer.transformer';
import { AwsFunctionTransformer } from './function/function.transformer';

import './deploymentStrategy/rollingPush.strategy';

import './logo/aws.logo.less';
Expand Down Expand Up @@ -74,7 +73,6 @@ module(AMAZON_MODULE, [
AWS_SERVER_GROUP_TRANSFORMER,
require('./instance/awsInstanceType.service').name,
AWS_LOAD_BALANCER_MODULE,
AWS_FUNCTION_MODULE,
require('./instance/details/instance.details.controller').name,
AWS_SECURITY_GROUP_MODULE,
SUBNET_RENDERER,
Expand Down Expand Up @@ -129,9 +127,6 @@ module(AMAZON_MODULE, [
ClusterContainer: AmazonLoadBalancerClusterContainer,
LoadBalancersTag: AmazonLoadBalancersTag,
},
function: {
transformer: AwsFunctionTransformer,
},
securityGroup: {
transformer: 'awsSecurityGroupTransformer',
reader: 'awsSecurityGroupReader',
Expand Down
29 changes: 0 additions & 29 deletions app/scripts/modules/amazon/src/domain/IAmazonFunction.ts

This file was deleted.

1 change: 0 additions & 1 deletion app/scripts/modules/amazon/src/domain/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
export * from './IAmazonCertificate';
export * from './IAmazonInstance';
export * from './IAmazonLoadBalancer';
export * from './IAmazonFunction';
export * from './IAmazonLoadBalancerSourceData';
export * from './IAmazonHealth';
export * from './IAmazonScalingPolicy';
Expand Down
5 changes: 0 additions & 5 deletions app/scripts/modules/amazon/src/function/function.module.ts

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion app/scripts/modules/amazon/src/function/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion app/scripts/modules/amazon/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ export * from './common';
export * from './domain';
export * from './keyPairs';
export * from './loadBalancer';
export * from './function';
export * from './reactShims';
export * from './serverGroup';
export * from './templates';
Expand Down
4 changes: 2 additions & 2 deletions 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 { FUNCTION_MODULE } from './function/function.module';

import { NETWORK_INTERCEPTOR } from './api/network.interceptor';

import { PAGE_TITLE_MODULE } from './pageTitle/pageTitle.module';
Expand Down Expand Up @@ -114,7 +114,7 @@ module(CORE_MODULE, [

LABEL_FILTER_COMPONENT,
LOAD_BALANCER_MODULE,
FUNCTION_MODULE,

MANAGED_RESOURCE_CONFIG,
require('./modal/modal.module').name,

Expand Down
27 changes: 0 additions & 27 deletions app/scripts/modules/core/src/domain/IFunction.ts

This file was deleted.

2 changes: 1 addition & 1 deletion app/scripts/modules/core/src/domain/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export * from './IExecution';
export * from './IExecutionStage';
export * from './IExecutionTrigger';
export * from './IExpectedArtifact';
export * from './IFunction';

export * from './IHealth';

export * from './IInstance';
Expand Down
25 changes: 1 addition & 24 deletions app/scripts/modules/core/src/entityTag/EntityTagsReader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,7 @@ import { $q } from 'ngimport';
import { API } from 'core/api/ApiService';
import { IEntityTags, IEntityTag, ICreationMetadataTag } from '../domain/IEntityTags';
import { Application } from 'core/application/application.model';
import {
IExecution,
IPipeline,
IServerGroup,
IServerGroupManager,
ILoadBalancer,
ISecurityGroup,
IFunction,
} from 'core/domain';
import { IExecution, IPipeline, IServerGroup, IServerGroupManager, ILoadBalancer, ISecurityGroup } from 'core/domain';
import { SETTINGS } from 'core/config/settings';

export class EntityTagsReader {
Expand Down Expand Up @@ -79,21 +71,6 @@ export class EntityTagsReader {
});
}

public static addTagsToFunctions(application: Application): void {
if (!SETTINGS.feature.entityTags) {
return;
}
const allTags = application.getDataSource('entityTags').data;
const functionTags: IEntityTags[] = allTags.filter(t => t.entityRef.entityType === 'function');
application.getDataSource('functions').data.forEach((fn: IFunction) => {
fn.entityTags = functionTags.find(
t =>
t.entityRef.entityId === fn.functionName &&
t.entityRef.account === fn.account &&
t.entityRef.region === fn.region,
);
});
}
public static addTagsToSecurityGroups(application: Application): void {
if (!SETTINGS.feature.entityTags) {
return;
Expand Down
46 changes: 0 additions & 46 deletions app/scripts/modules/core/src/function/Function.tsx

This file was deleted.

11 changes: 0 additions & 11 deletions app/scripts/modules/core/src/function/FunctionDetails.tsx

This file was deleted.

33 changes: 0 additions & 33 deletions app/scripts/modules/core/src/function/FunctionGroupings.tsx

This file was deleted.

39 changes: 0 additions & 39 deletions app/scripts/modules/core/src/function/FunctionPod.tsx

This file was deleted.

Loading

0 comments on commit e49ffaf

Please sign in to comment.