fix(google): make AbstractAtomicOperationsCredentialsConverter generi…

…c type (#5866) (cherry picked from commit 27ed951)
spinnaker · Feb 14, 2023 · a3658f3 · a3658f3
1 parent 31e8fc3
commit a3658f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...innaker/clouddriver/google/deploy/converters/SetStatefulDiskAtomicOperationConverter.java b/...innaker/clouddriver/google/deploy/converters/SetStatefulDiskAtomicOperationConverter.java
@@ -21,6 +21,7 @@
 import com.netflix.spinnaker.clouddriver.google.deploy.description.SetStatefulDiskDescription;
 import com.netflix.spinnaker.clouddriver.google.deploy.ops.SetStatefulDiskAtomicOperation;
 import com.netflix.spinnaker.clouddriver.google.provider.view.GoogleClusterProvider;
+import com.netflix.spinnaker.clouddriver.google.security.GoogleNamedAccountCredentials;
 import com.netflix.spinnaker.clouddriver.orchestration.AtomicOperations;
 import com.netflix.spinnaker.clouddriver.security.AbstractAtomicOperationsCredentialsConverter;
 import java.util.Map;
@@ -30,7 +31,7 @@
 @GoogleOperation(AtomicOperations.SET_STATEFUL_DISK)
 @Component
 public class SetStatefulDiskAtomicOperationConverter
-    extends AbstractAtomicOperationsCredentialsConverter {
+    extends AbstractAtomicOperationsCredentialsConverter<GoogleNamedAccountCredentials> {
 
   private final GoogleClusterProvider clusterProvider;
   private final GoogleComputeApiFactory computeApiFactory;

diff --git a/...ker/clouddriver/google/deploy/converters/StatefullyUpdateBootImageOperationConverter.java b/...ker/clouddriver/google/deploy/converters/StatefullyUpdateBootImageOperationConverter.java
@@ -22,6 +22,7 @@
 import com.netflix.spinnaker.clouddriver.google.deploy.description.StatefullyUpdateBootImageDescription;
 import com.netflix.spinnaker.clouddriver.google.deploy.ops.StatefullyUpdateBootImageAtomicOperation;
 import com.netflix.spinnaker.clouddriver.google.provider.view.GoogleClusterProvider;
+import com.netflix.spinnaker.clouddriver.google.security.GoogleNamedAccountCredentials;
 import com.netflix.spinnaker.clouddriver.orchestration.AtomicOperations;
 import com.netflix.spinnaker.clouddriver.security.AbstractAtomicOperationsCredentialsConverter;
 import java.util.Map;
@@ -31,7 +32,7 @@
 @GoogleOperation(AtomicOperations.STATEFULLY_UPDATE_BOOT_IMAGE)
 @Component
 public class StatefullyUpdateBootImageOperationConverter
-    extends AbstractAtomicOperationsCredentialsConverter {
+    extends AbstractAtomicOperationsCredentialsConverter<GoogleNamedAccountCredentials> {
 
   private final GoogleClusterProvider clusterProvider;
   private final GoogleComputeApiFactory computeApiFactory;