@spinnaker/google 2026.2.2 → 2026.3.0

package/src/gce.module.ts

@@ -1,157 +1,137 @@
-import { module } from 'angular';
+import { CloudProviderRegistry, DeploymentStrategyRegistry, Registry } from '@spinnaker/core';
 
-import { CloudProviderRegistry, DeploymentStrategyRegistry } from '@spinnaker/core';
-
-import { GCE_PREDICTIVE_AUTOSCALING } from './autoscalingPolicy/components/metricSettings/GcePredictiveAutoscaling';
-import { GOOGLE_CACHE_CACHECONFIGURER_SERVICE } from './cache/cacheConfigurer.service';
-import { GOOGLE_COMMON_XPNNAMING_GCE_SERVICE } from './common/xpnNaming.gce.service';
+import { GceCacheConfigurer } from './cache/cacheConfigurer.service';
 import './help/gce.help';
 import { GceImageReader } from './image';
-import { GOOGLE_INSTANCE_CUSTOM_CUSTOMINSTANCE_FILTER } from './instance/custom/customInstance.filter';
-import { GOOGLE_INSTANCE_DETAILS_INSTANCE_DETAILS_CONTROLLER } from './instance/details/instance.details.controller';
-import { GOOGLE_INSTANCE_GCEINSTANCETYPE_SERVICE } from './instance/gceInstanceType.service';
-import { GOOGLE_INSTANCE_GCEMULTIINSTANCETASK_TRANSFORMER } from './instance/gceMultiInstanceTask.transformer';
-import { IAP_INTERCEPTOR } from './interceptors/iap.interceptor';
-import { GCE_LOAD_BALANCER_CHOICE_MODAL } from './loadBalancer/configure/choice/gceLoadBalancerChoice.modal';
-import { openGCEPipelineLoadBalancerModal } from './loadBalancer/configure/choice/gceLoadBalancerPipelineModal';
-import { GOOGLE_LOADBALANCER_CONFIGURE_HTTP_CREATEHTTPLOADBALANCER_CONTROLLER } from './loadBalancer/configure/http/createHttpLoadBalancer.controller';
-import { GCE_INTERNAL_LOAD_BALANCER_CTRL } from './loadBalancer/configure/internal/gceCreateInternalLoadBalancer.controller';
-import { GOOGLE_LOADBALANCER_CONFIGURE_INTERNAL_HTTP_CREATEHTTPLOADBALANCER_CONTROLLER } from './loadBalancer/configure/internalhttp/createInternalHttpLoadBalancer.controller';
-import { GOOGLE_LOADBALANCER_CONFIGURE_NETWORK_CREATELOADBALANCER_CONTROLLER } from './loadBalancer/configure/network/createLoadBalancer.controller';
-import { GCE_SSL_LOAD_BALANCER_CTRL } from './loadBalancer/configure/ssl/gceCreateSslLoadBalancer.controller';
-import { GCE_TCP_LOAD_BALANCER_CTRL } from './loadBalancer/configure/tcp/gceCreateTcpLoadBalancer.controller';
-import { GOOGLE_LOADBALANCER_DETAILS_LOADBALANCERDETAIL_CONTROLLER } from './loadBalancer/details/loadBalancerDetail.controller';
-import { LOAD_BALANCER_SET_TRANSFORMER } from './loadBalancer/loadBalancer.setTransformer';
-import { GOOGLE_LOADBALANCER_LOADBALANCER_TRANSFORMER } from './loadBalancer/loadBalancer.transformer';
+import { GceInstanceDetails } from './instance/details/GceInstanceDetails';
+import { GceInstanceTypeService } from './instance/gceInstanceType.service';
+import { GceMultiInstanceTaskTransformer } from './instance/gceMultiInstanceTask.transformer';
+import { GceLoadBalancerChoiceModal } from './loadBalancer/configure/choice/GceLoadBalancerChoiceModal';
+import {
+  GceLoadBalancerActions,
+  gceLoadBalancerDetailsSections,
+  useGceLoadBalancerDetails,
+} from './loadBalancer/details/gceLoadBalancerDetails';
+import { GceLoadBalancerSetTransformer } from './loadBalancer/loadBalancer.setTransformer';
+import { GceLoadBalancerTransformer } from './loadBalancer/loadBalancer.transformer';
 import logo from './logo/gce.logo.png';
-import { GOOGLE_PIPELINE_STAGES_BAKE_GCEBAKESTAGE } from './pipeline/stages/bake/gceBakeStage';
-import { GOOGLE_PIPELINE_STAGES_CLONESERVERGROUP_GCECLONESERVERGROUPSTAGE } from './pipeline/stages/cloneServerGroup/gceCloneServerGroupStage';
-import { GOOGLE_PIPELINE_STAGES_DESTROYASG_GCEDESTROYASGSTAGE } from './pipeline/stages/destroyAsg/gceDestroyAsgStage';
-import { GOOGLE_PIPELINE_STAGES_DISABLEASG_GCEDISABLEASGSTAGE } from './pipeline/stages/disableAsg/gceDisableAsgStage';
-import { GOOGLE_PIPELINE_STAGES_DISABLECLUSTER_GCEDISABLECLUSTERSTAGE } from './pipeline/stages/disableCluster/gceDisableClusterStage';
-import { GOOGLE_PIPELINE_STAGES_ENABLEASG_GCEENABLEASGSTAGE } from './pipeline/stages/enableAsg/gceEnableAsgStage';
-import { GOOGLE_PIPELINE_STAGES_FINDAMI_GCEFINDAMISTAGE } from './pipeline/stages/findAmi/gceFindAmiStage';
-import { GOOGLE_PIPELINE_STAGES_FINDIMAGEFROMTAGS_GCEFINDIMAGEFROMTAGSSTAGE } from './pipeline/stages/findImageFromTags/gceFindImageFromTagsStage';
-import { GOOGLE_PIPELINE_STAGES_RESIZEASG_GCERESIZEASGSTAGE } from './pipeline/stages/resizeAsg/gceResizeAsgStage';
-import { GOOGLE_PIPELINE_STAGES_SCALEDOWNCLUSTER_GCESCALEDOWNCLUSTERSTAGE } from './pipeline/stages/scaleDownCluster/gceScaleDownClusterStage';
-import { GOOGLE_PIPELINE_STAGES_SHRINKCLUSTER_GCESHRINKCLUSTERSTAGE } from './pipeline/stages/shrinkCluster/gceShrinkClusterStage';
-import { GOOGLE_PIPELINE_STAGES_TAGIMAGE_GCETAGIMAGESTAGE } from './pipeline/stages/tagImage/gceTagImageStage';
-import { GOOGLE_SECURITYGROUP_CONFIGURE_CREATESECURITYGROUP_CONTROLLER } from './securityGroup/configure/createSecurityGroup.controller';
-import { GOOGLE_SECURITYGROUP_CONFIGURE_EDITSECURITYGROUP_CONTROLLER } from './securityGroup/configure/editSecurityGroup.controller';
-import { GOOGLE_SECURITYGROUP_DETAILS_SECURITYGROUPDETAIL_CONTROLLER } from './securityGroup/details/securityGroupDetail.controller';
-import { GOOGLE_SECURITYGROUP_SECURITYGROUP_READER } from './securityGroup/securityGroup.reader';
-import { GOOGLE_SECURITYGROUP_SECURITYGROUP_TRANSFORMER } from './securityGroup/securityGroup.transformer';
-import { GOOGLE_SERVERGROUP_CONFIGURE_SERVERGROUP_CONFIGURE_GCE_MODULE } from './serverGroup/configure/serverGroup.configure.gce.module';
-import { GOOGLE_SERVERGROUP_CONFIGURE_SERVERGROUPCOMMANDBUILDER_SERVICE } from './serverGroup/configure/serverGroupCommandBuilder.service';
-import { GOOGLE_SERVERGROUP_CONFIGURE_WIZARD_CLONESERVERGROUP_GCE_CONTROLLER } from './serverGroup/configure/wizard/cloneServerGroup.gce.controller';
-import { GCE_SERVER_GROUP_DISK_DESCRIPTIONS } from './serverGroup/details/ServerGroupDiskDescriptions';
-import { GCE_SCALE_IN_CONTROLS } from './serverGroup/details/autoscalingPolicy/modal/GceScaleInControls';
-import { GOOGLE_SERVERGROUP_DETAILS_SERVERGROUP_DETAILS_GCE_MODULE } from './serverGroup/details/serverGroup.details.gce.module';
-import { GOOGLE_SERVERGROUP_SERVERGROUP_TRANSFORMER } from './serverGroup/serverGroup.transformer';
-import { GOOGLE_SUBNET_SUBNET_RENDERER } from './subnet/subnet.renderer';
-import { GOOGLE_VALIDATION_APPLICATIONNAME_VALIDATOR } from './validation/applicationName.validator';
+import { registerGceBakeStage } from './pipeline/stages/bake/gceBakeStage';
+import { registerGceCloneServerGroupStage } from './pipeline/stages/cloneServerGroup/gceCloneServerGroupStage';
+import { registerGceDestroyAsgStage } from './pipeline/stages/destroyAsg/gceDestroyAsgStage';
+import { registerGceDisableAsgStage } from './pipeline/stages/disableAsg/gceDisableAsgStage';
+import { registerGceDisableClusterStage } from './pipeline/stages/disableCluster/gceDisableClusterStage';
+import { registerGceEnableAsgStage } from './pipeline/stages/enableAsg/gceEnableAsgStage';
+import { registerGceFindAmiStage } from './pipeline/stages/findAmi/gceFindAmiStage';
+import { registerGceFindImageFromTagsStage } from './pipeline/stages/findImageFromTags/gceFindImageFromTagsStage';
+import { registerGceResizeAsgStage } from './pipeline/stages/resizeAsg/gceResizeAsgStage';
+import { registerGceScaleDownClusterStage } from './pipeline/stages/scaleDownCluster/gceScaleDownClusterStage';
+import { registerGceShrinkClusterStage } from './pipeline/stages/shrinkCluster/gceShrinkClusterStage';
+import { registerGceTagImageStage } from './pipeline/stages/tagImage/gceTagImageStage';
+import { GceSecurityGroupModal } from './securityGroup/configure/GceSecurityGroupModal';
+import { GceSecurityGroupDetails } from './securityGroup/details/GceSecurityGroupDetails';
+import { GceSecurityGroupReader } from './securityGroup/securityGroup.reader';
+import { GceSecurityGroupTransformer } from './securityGroup/securityGroup.transformer';
+import { GceServerGroupCommandBuilder } from './serverGroup/configure/serverGroupCommandBuilder.service';
+import { GceServerGroupConfigurationService } from './serverGroup/configure/serverGroupConfiguration.service';
+import { GceCloneServerGroupModal } from './serverGroup/configure/wizard/GceCloneServerGroupModal';
+import { GceCustomInstanceBuilder } from './serverGroup/configure/wizard/customInstance/GceCustomInstanceBuilder';
+import {
+  GceServerGroupActions,
+  gceServerGroupDetailsGetter,
+  gceServerGroupDetailsSections,
+} from './serverGroup/details/gceServerGroupDetails';
+import { GceServerGroupTransformer } from './serverGroup/serverGroup.transformer';
+import { GceSubnetRenderer } from './subnet/subnet.renderer';
+import './validation/ApplicationNameValidator';
 
 import './logo/gce.logo.less';
 
-export const GOOGLE_MODULE = 'spinnaker.gce';
-module(GOOGLE_MODULE, [
-  LOAD_BALANCER_SET_TRANSFORMER,
-  GCE_INTERNAL_LOAD_BALANCER_CTRL,
-  GCE_LOAD_BALANCER_CHOICE_MODAL,
-  GCE_SSL_LOAD_BALANCER_CTRL,
-  GCE_TCP_LOAD_BALANCER_CTRL,
-  IAP_INTERCEPTOR,
-  GCE_SERVER_GROUP_DISK_DESCRIPTIONS,
-  GCE_SCALE_IN_CONTROLS,
-  GCE_PREDICTIVE_AUTOSCALING,
-  GOOGLE_SERVERGROUP_DETAILS_SERVERGROUP_DETAILS_GCE_MODULE,
-  GOOGLE_SERVERGROUP_CONFIGURE_SERVERGROUPCOMMANDBUILDER_SERVICE,
-  GOOGLE_SERVERGROUP_CONFIGURE_WIZARD_CLONESERVERGROUP_GCE_CONTROLLER,
-  GOOGLE_SERVERGROUP_CONFIGURE_SERVERGROUP_CONFIGURE_GCE_MODULE,
-  GOOGLE_SERVERGROUP_SERVERGROUP_TRANSFORMER,
-  GOOGLE_PIPELINE_STAGES_BAKE_GCEBAKESTAGE,
-  GOOGLE_PIPELINE_STAGES_CLONESERVERGROUP_GCECLONESERVERGROUPSTAGE,
-  GOOGLE_PIPELINE_STAGES_DESTROYASG_GCEDESTROYASGSTAGE,
-  GOOGLE_PIPELINE_STAGES_DISABLEASG_GCEDISABLEASGSTAGE,
-  GOOGLE_PIPELINE_STAGES_DISABLECLUSTER_GCEDISABLECLUSTERSTAGE,
-  GOOGLE_PIPELINE_STAGES_ENABLEASG_GCEENABLEASGSTAGE,
-  GOOGLE_PIPELINE_STAGES_FINDAMI_GCEFINDAMISTAGE,
-  GOOGLE_PIPELINE_STAGES_FINDIMAGEFROMTAGS_GCEFINDIMAGEFROMTAGSSTAGE,
-  GOOGLE_PIPELINE_STAGES_RESIZEASG_GCERESIZEASGSTAGE,
-  GOOGLE_PIPELINE_STAGES_SCALEDOWNCLUSTER_GCESCALEDOWNCLUSTERSTAGE,
-  GOOGLE_PIPELINE_STAGES_SHRINKCLUSTER_GCESHRINKCLUSTERSTAGE,
-  GOOGLE_PIPELINE_STAGES_TAGIMAGE_GCETAGIMAGESTAGE,
-  GOOGLE_INSTANCE_GCEINSTANCETYPE_SERVICE,
-  GOOGLE_INSTANCE_GCEMULTIINSTANCETASK_TRANSFORMER,
-  GOOGLE_INSTANCE_CUSTOM_CUSTOMINSTANCE_FILTER,
-  GOOGLE_LOADBALANCER_LOADBALANCER_TRANSFORMER,
-  GOOGLE_LOADBALANCER_DETAILS_LOADBALANCERDETAIL_CONTROLLER,
-  GOOGLE_LOADBALANCER_CONFIGURE_NETWORK_CREATELOADBALANCER_CONTROLLER,
-  GOOGLE_LOADBALANCER_CONFIGURE_HTTP_CREATEHTTPLOADBALANCER_CONTROLLER,
-  GOOGLE_LOADBALANCER_CONFIGURE_INTERNAL_HTTP_CREATEHTTPLOADBALANCER_CONTROLLER,
-  GOOGLE_INSTANCE_DETAILS_INSTANCE_DETAILS_CONTROLLER,
-  GOOGLE_SECURITYGROUP_DETAILS_SECURITYGROUPDETAIL_CONTROLLER,
-  GOOGLE_SECURITYGROUP_CONFIGURE_CREATESECURITYGROUP_CONTROLLER,
-  GOOGLE_SECURITYGROUP_CONFIGURE_EDITSECURITYGROUP_CONTROLLER,
-  GOOGLE_SECURITYGROUP_SECURITYGROUP_TRANSFORMER,
-  GOOGLE_SECURITYGROUP_SECURITYGROUP_READER,
-  GOOGLE_SUBNET_SUBNET_RENDERER,
-  GOOGLE_VALIDATION_APPLICATIONNAME_VALIDATOR,
-  GOOGLE_CACHE_CACHECONFIGURER_SERVICE,
-  GOOGLE_COMMON_XPNNAMING_GCE_SERVICE,
-]).config(() => {
+export function registerGoogleProvider(): void {
   CloudProviderRegistry.registerProvider('gce', {
     name: 'Google',
     logo: {
       path: logo,
     },
+    applicationProviderFields: [
+      {
+        field: 'associatePublicIpAddress',
+        helpKey: 'gce.serverGroup.associatePublicIpAddress.providerField',
+        label: 'Associate Public IP Address',
+        type: 'boolean',
+      },
+    ],
     cache: {
-      configurer: 'gceCacheConfigurer',
+      configurer: GceCacheConfigurer,
     },
     image: {
       reader: GceImageReader,
     },
     serverGroup: {
-      transformer: 'gceServerGroupTransformer',
-      detailsTemplateUrl: require('./serverGroup/details/serverGroupDetails.html'),
-      detailsController: 'gceServerGroupDetailsCtrl',
-      cloneServerGroupTemplateUrl: require('./serverGroup/configure/wizard/serverGroupWizard.html'),
-      cloneServerGroupController: 'gceCloneServerGroupCtrl',
-      commandBuilder: 'gceServerGroupCommandBuilder',
-      configurationService: 'gceServerGroupConfigurationService',
+      transformer: GceServerGroupTransformer,
+      commandBuilder: GceServerGroupCommandBuilder,
+      configurationService: GceServerGroupConfigurationService,
+      CloneServerGroupModal: GceCloneServerGroupModal,
+      detailsActions: GceServerGroupActions,
+      detailsGetter: gceServerGroupDetailsGetter,
+      detailsSections: gceServerGroupDetailsSections,
     },
     instance: {
-      instanceTypeService: 'gceInstanceTypeService',
-      detailsTemplateUrl: require('./instance/details/instanceDetails.html'),
-      detailsController: 'gceInstanceDetailsCtrl',
-      multiInstanceTaskTransformer: 'gceMultiInstanceTaskTransformer',
-      customInstanceBuilderTemplateUrl: require('./serverGroup/configure/wizard/customInstance/customInstanceBuilder.html'),
+      CustomInstanceBuilder: GceCustomInstanceBuilder,
+      details: GceInstanceDetails,
+      instanceTypeService: GceInstanceTypeService,
+      multiInstanceTaskTransformer: GceMultiInstanceTaskTransformer,
     },
     loadBalancer: {
-      transformer: 'gceLoadBalancerTransformer',
-      setTransformer: 'gceLoadBalancerSetTransformer',
-      detailsTemplateUrl: require('./loadBalancer/details/loadBalancerDetails.html'),
-      detailsController: 'gceLoadBalancerDetailsCtrl',
-      createLoadBalancerTemplateUrl: require('./loadBalancer/configure/choice/gceLoadBalancerChoice.modal.html'),
-      createLoadBalancerController: 'gceLoadBalancerChoiceCtrl',
-      pipelineCreateLoadBalancerModal: openGCEPipelineLoadBalancerModal,
+      CreateLoadBalancerModal: GceLoadBalancerChoiceModal,
+      pipelineCreateLoadBalancerModal: (props: any) =>
+        GceLoadBalancerChoiceModal.show({ ...props, app: props.application, forPipelineConfig: true }),
+      detailsActions: GceLoadBalancerActions,
+      detailsSections: gceLoadBalancerDetailsSections,
+      transformer: GceLoadBalancerTransformer,
+      setTransformer: GceLoadBalancerSetTransformer,
+      useDetailsHook: useGceLoadBalancerDetails,
     },
     securityGroup: {
-      transformer: 'gceSecurityGroupTransformer',
-      reader: 'gceSecurityGroupReader',
-      detailsTemplateUrl: require('./securityGroup/details/securityGroupDetail.html'),
-      detailsController: 'gceSecurityGroupDetailsCtrl',
-      createSecurityGroupTemplateUrl: require('./securityGroup/configure/createSecurityGroup.html'),
-      createSecurityGroupController: 'gceCreateSecurityGroupCtrl',
+      CreateSecurityGroupModal: GceSecurityGroupModal,
+      details: GceSecurityGroupDetails,
+      transformer: GceSecurityGroupTransformer,
+      reader: GceSecurityGroupReader,
     },
     subnet: {
-      renderer: 'gceSubnetRenderer',
+      renderer: GceSubnetRenderer,
     },
     snapshotsEnabled: true,
-    applicationProviderFields: {
-      templateUrl: require('./applicationProviderFields/gceFields.html'),
-    },
   });
-});
+}
+
+registerGoogleProvider();
+
+function registerPipelineStageOnce(stageKey: string, registerStage: () => void): void {
+  const isRegistered = Registry.pipeline.getStageTypes().some((stage) => {
+    const registeredStageKey = stage.provides || stage.key;
+    return registeredStageKey === stageKey && stage.cloudProvider === 'gce';
+  });
+
+  if (!isRegistered) {
+    registerStage();
+  }
+}
+
+export function registerGooglePipelineStages(): void {
+  registerPipelineStageOnce('bake', registerGceBakeStage);
+  registerPipelineStageOnce('cloneServerGroup', registerGceCloneServerGroupStage);
+  registerPipelineStageOnce('destroyServerGroup', registerGceDestroyAsgStage);
+  registerPipelineStageOnce('disableServerGroup', registerGceDisableAsgStage);
+  registerPipelineStageOnce('disableCluster', registerGceDisableClusterStage);
+  registerPipelineStageOnce('enableServerGroup', registerGceEnableAsgStage);
+  registerPipelineStageOnce('findImage', registerGceFindAmiStage);
+  registerPipelineStageOnce('findImageFromTags', registerGceFindImageFromTagsStage);
+  registerPipelineStageOnce('resizeServerGroup', registerGceResizeAsgStage);
+  registerPipelineStageOnce('scaleDownCluster', registerGceScaleDownClusterStage);
+  registerPipelineStageOnce('shrinkCluster', registerGceShrinkClusterStage);
+  registerPipelineStageOnce('upsertImageTags', registerGceTagImageStage);
+}
+
+registerGooglePipelineStages();
 
 DeploymentStrategyRegistry.registerProvider('gce', ['custom', 'redblack']);

package/src/healthCheck/healthCheck.read.service.ts

@@ -1,4 +1,3 @@
-import { module } from 'angular';
 import { uniqWith } from 'lodash';
 
 import type { ISearchResults } from '@spinnaker/core';
@@ -16,7 +15,7 @@ interface IHealthCheckSearchResults {
 }
 
 export class GceHealthCheckReader {
-  public listHealthChecks(type?: string): PromiseLike<IGceHealthCheck[]> {
+  public listHealthChecks(type?: string): Promise<IGceHealthCheck[]> {
     if (type) {
       return this.listHealthChecks().then((healthChecks) =>
         healthChecks.filter((healthCheck) => healthCheck.healthCheckType === type),
@@ -50,6 +49,3 @@ export class GceHealthCheckReader {
     }
   }
 }
-
-export const GCE_HEALTH_CHECK_READER = 'spinnaker.gce.healthCheck.reader';
-module(GCE_HEALTH_CHECK_READER, []).service('gceHealthCheckReader', GceHealthCheckReader);

package/src/help/gce.help.ts

@@ -135,7 +135,9 @@ const helpContents: { [key: string]: string } = {
   'gce.serverGroup.labels.spinnaker-region': 'This label can be used to group instances when querying for metrics.',
   'gce.serverGroup.labels.spinnaker-server-group':
     'This label can be used to group instances when querying for metrics.',
-  'gce.serverGroup.shieldedVmConfig':
+  'gce.serverGroup.instanceFlexibilityPolicy':
+    'Defines named sets of acceptable machine types for a regional managed instance group. Lower ranks are preferred; Google Compute Engine selects an available type when creating each VM.',
+  'gce.serverGroup.shieldedInstanceConfig':
     'Shielded VM features include trusted UEFI firmware and come with options for Secure Boot, Virtual Trusted Platform Module (vTPM), and Integrity Monitoring.',
   'gce.serverGroup.shieldedVmSecureBoot':
     'Secure boot helps protect your VM instances against boot-level and kernel-level malware and rootkits.',
@@ -172,12 +174,6 @@ const helpContents: { [key: string]: string } = {
     'VMs in the group are recreated as needed. You can use a health check to recreate a VM if the health check finds the VM unresponsive. If you do not select a health check, VMs are recreated only when stopped.',
   'gce.serverGroup.initialDelaySec':
     'The time to allow an instance to boot and applications to fully start before the first health check.',
-  'gce.serverGroup.maxUnavailable': `
-      Maximum number of instances that can be unavailable when auto-healing. The instance is considered available if all of the following conditions are satisfied:
-      <ul>
-        <li>1. Instance's status is RUNNING.</li>
-        <li>2. Instance's liveness health check result was observed to be HEALTHY at least once.</li>
-      </ul>`,
   'gce.serverGroup.subnet': `
       Subnetworks allow you to regionally segment the network IP space into prefixes (subnets) and control which prefix a VM instance's internal IP address is allocated from. There are several types of GCE networks:
       <ul>

package/src/image/ImageSelect.tsx

@@ -1,11 +1,7 @@
-import { module } from 'angular';
 import { chain } from 'lodash';
 import React from 'react';
 import type { AutocompleteResult, Option } from 'react-select';
 import { Async } from 'react-select';
-import { react2angular } from 'react2angular';
-
-import { withErrorBoundary } from '@spinnaker/core';
 
 import type { IGceImage } from '../image';
 
@@ -53,14 +49,3 @@ export class ImageSelect extends React.Component<IImageSelectProps> {
     );
   }
 }
-
-export const GCE_IMAGE_SELECT = 'spinnaker.gce.imageSelect';
-module(GCE_IMAGE_SELECT, []).component(
-  'gceImageSelect',
-  react2angular(withErrorBoundary(ImageSelect, 'gceImageSelect'), [
-    'availableImages',
-    'selectedImage',
-    'selectImage',
-    'target',
-  ]),
-);

package/src/image/image.reader.spec.ts

@@ -0,0 +1,10 @@
+import { GceImageReader } from './image.reader';
+
+describe('GceImageReader', () => {
+  it('returns a native Promise that resolves to null for regional image lookups', async () => {
+    const result = GceImageReader.getImage();
+
+    expect(result instanceof Promise).toBe(true);
+    await expectAsync(result).toBeResolvedTo(null);
+  });
+});

package/src/image/image.reader.ts

@@ -5,15 +5,15 @@ export interface IGceImage {
 }
 
 export class GceImageReader {
-  public static findImages(params: { account?: string; provider?: string; q?: string }): PromiseLike<IGceImage[]> {
+  public static findImages(params: { account?: string; provider?: string; q?: string }): Promise<IGceImage[]> {
     return REST('/images/find')
       .query(params)
       .get()
       .catch(() => [] as IGceImage[]);
   }
 
-  public static getImage(/*amiName: string, region: string, credentials: string*/): PromiseLike<IGceImage> {
+  public static getImage(/*amiName: string, region: string, credentials: string*/): Promise<IGceImage | null> {
     // GCE images are not regional so we don't need to retrieve ids scoped to regions.
-    return null;
+    return Promise.resolve(null);
   }
 }

package/src/index.ts

@@ -1 +1 @@
-export { GOOGLE_MODULE } from './gce.module';
+export { registerGooglePipelineStages, registerGoogleProvider } from './gce.module';