CB-18696 creator field cleanup part 1

horadla23 · lnardai · commit 503e83832316 · 2022-09-27T10:33:29.000+02:00
- in blueprint, customimage, vmimage entities, creator field is not used
- same applies for NetworkCreationRequest
diff --git a/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/network/NetworkCreationRequest.java b/cloud-api/src/main/java/com/sequenceiq/cloudbreak/cloud/model/network/NetworkCreationRequest.java
@@ -22,8 +22,6 @@ public class NetworkCreationRequest {
 
     private final String userName;
 
-    private final String creatorCrn;
-
     private String accountId;
 
     private final Region region;
@@ -62,7 +60,6 @@ private NetworkCreationRequest(Builder builder) {
         privateSubnetEnabled = builder.privateSubnetEnabled;
         privateEndpointType = builder.privateEndpointType;
         userName = builder.userName;
-        creatorCrn = builder.creatorCrn;
         tags = builder.tags;
         accountId = builder.accountId;
     }
@@ -127,10 +124,6 @@ public String getUserName() {
         return userName;
     }
 
-    public String getCreatorCrn() {
-        return creatorCrn;
-    }
-
     public Map<String, String> getTags() {
         return tags;
     }
@@ -170,8 +163,6 @@ public static class Builder {
 
         private PrivateEndpointType privateEndpointType;
 
-        private String creatorCrn;
-
         private String accountId;
 
         private Map<String, String> tags = new HashMap<>();
@@ -256,11 +247,6 @@ public Builder withAccountId(String accountId) {
             return this;
         }
 
-        public Builder withCreatorCrn(String creatorCrn) {
-            this.creatorCrn = creatorCrn;
-            return this;
-        }
-
         public Builder withTags(Map<String, String> tags) {
             this.tags = tags;
             return this;
diff --git a/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNetworkConnector.java b/cloud-aws-cloudformation/src/main/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNetworkConnector.java
@@ -211,8 +211,7 @@ private CreatedCloudNetwork createNewCfNetworkStack(
 
         cloudFormationRetryClient.createStack(createStackRequest(networkRequest.getStackName(),
                 cloudFormationTemplate,
-                networkRequest.getTags(),
-                networkRequest.getCreatorCrn()));
+                networkRequest.getTags()));
         LOGGER.debug("CloudFormation stack creation request sent with stack name: '{}' ", networkRequest.getStackName());
         return getCreatedNetworkWithPolling(networkRequest, credentialView, cloudFormationRetryClient, subnetRequests);
     }
@@ -241,7 +240,7 @@ private CreatedCloudNetwork getCreatedCloudNetwork(AmazonCloudFormationClient cl
         return new CreatedCloudNetwork(networkRequest.getStackName(), vpcId, subnets);
     }
 
-    private CreateStackRequest createStackRequest(String stackName, String cloudFormationTemplate, Map<String, String> tags, String creatorUser) {
+    private CreateStackRequest createStackRequest(String stackName, String cloudFormationTemplate, Map<String, String> tags) {
         Collection<Tag> awsTags = awsTaggingService.prepareCloudformationTags(null, tags);
         return new CreateStackRequest()
                 .withStackName(stackName)
diff --git a/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNetworkConnectorTest.java b/cloud-aws-cloudformation/src/test/java/com/sequenceiq/cloudbreak/cloud/aws/AwsNetworkConnectorTest.java
@@ -550,7 +550,6 @@ private NetworkCreationRequest createNetworkRequest(String networkCidr, Set<Netw
                 .withPublicSubnets(subnets)
                 .withPrivateSubnetEnabled(true)
                 .withUserName("user@cloudera.com")
-                .withCreatorCrn("user-crn")
                 .build();
     }
 
diff --git a/cloud-gcp/src/test/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpNetworkConnectorTest.java b/cloud-gcp/src/test/java/com/sequenceiq/cloudbreak/cloud/gcp/GcpNetworkConnectorTest.java
@@ -101,13 +101,11 @@ public void testCreateNetworkWithSubnetsWhenCreationGoesFine() throws Exception
         NetworkCreationRequest networkCreationRequest = new NetworkCreationRequest.Builder()
                 .withNetworkCidr("16.0.0.0/16")
                 .withAccountId("account-id")
-                .withCreatorCrn("creator-crn")
                 .withVariant("GCP")
                 .withEnvCrn("env-crn")
                 .withEnvName("super-env")
                 .withPrivateSubnetEnabled(true)
                 .withTags(new HashMap<>())
-                .withCreatorCrn("creator-crn")
                 .withRegion(Region.region("us-west-1"))
                 .withPublicSubnets(new HashSet<>())
                 .withPrivateSubnets(new HashSet<>())
@@ -176,13 +174,11 @@ public void testCreateNetworkWithSubnetsWhenCreationThrowTokenExceptionShouldThr
         NetworkCreationRequest networkCreationRequest = new NetworkCreationRequest.Builder()
                 .withNetworkCidr("16.0.0.0/16")
                 .withAccountId("account-id")
-                .withCreatorCrn("creator-crn")
                 .withVariant("GCP")
                 .withEnvCrn("env-crn")
                 .withEnvName("super-env")
                 .withPrivateSubnetEnabled(true)
                 .withTags(new HashMap<>())
-                .withCreatorCrn("creator-crn")
                 .withRegion(Region.region("us-west-1"))
                 .withPublicSubnets(new HashSet<>())
                 .withPrivateSubnets(new HashSet<>())
@@ -260,13 +256,11 @@ public void testCreateNetworkWithSubnetsWhenCreationThrowGoogleJsonResponseExcep
         NetworkCreationRequest networkCreationRequest = new NetworkCreationRequest.Builder()
                 .withNetworkCidr("16.0.0.0/16")
                 .withAccountId("account-id")
-                .withCreatorCrn("creator-crn")
                 .withVariant("GCP")
                 .withEnvCrn("env-crn")
                 .withEnvName("super-env")
                 .withPrivateSubnetEnabled(true)
                 .withTags(new HashMap<>())
-                .withCreatorCrn("creator-crn")
                 .withRegion(Region.region("us-west-1"))
                 .withPublicSubnets(new HashSet<>())
                 .withPrivateSubnets(new HashSet<>())
@@ -347,13 +341,11 @@ public void testCreateNetworkWithSubnetsWhenCreationThrowIoExceptionShouldThrowG
         NetworkCreationRequest networkCreationRequest = new NetworkCreationRequest.Builder()
                 .withNetworkCidr("16.0.0.0/16")
                 .withAccountId("account-id")
-                .withCreatorCrn("creator-crn")
                 .withVariant("GCP")
                 .withEnvCrn("env-crn")
                 .withEnvName("super-env")
                 .withPrivateSubnetEnabled(true)
                 .withTags(new HashMap<>())
-                .withCreatorCrn("creator-crn")
                 .withRegion(Region.region("us-west-1"))
                 .withPublicSubnets(new HashSet<>())
                 .withPrivateSubnets(new HashSet<>())
diff --git a/cluster-api/src/test/java/com/sequenceiq/cloudbreak/cluster/common/TestUtil.java b/cluster-api/src/test/java/com/sequenceiq/cloudbreak/cluster/common/TestUtil.java
@@ -465,7 +465,6 @@ public static Blueprint blueprint(Long id, String name, String blueprintText) {
         blueprint.setStatus(ResourceStatus.DEFAULT);
         blueprint.setTags(getEmptyJson());
         blueprint.setResourceCrn("someCrn");
-        blueprint.setCreator("someone");
         return blueprint;
     }
 
diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Blueprint.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/Blueprint.java
@@ -59,8 +59,6 @@ public class Blueprint implements ProvisionEntity, WorkspaceAwareResource {
 
     private String resourceCrn;
 
-    private String creator;
-
     private String stackType;
 
     private String stackVersion;
@@ -78,14 +76,6 @@ public void setResourceCrn(String resourceCrn) {
         this.resourceCrn = resourceCrn;
     }
 
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
     public Json getTags() {
         return tags;
     }
@@ -202,7 +192,6 @@ public String toString() {
                 ", tags=" + tags +
                 ", workspace=" + workspace +
                 ", resourceCrn='" + resourceCrn + '\'' +
-                ", creator='" + creator + '\'' +
                 ", stackType='" + stackType + '\'' +
                 ", stackVersion='" + stackVersion + '\'' +
                 ", created=" + created +
diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/CustomImage.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/CustomImage.java
@@ -1,7 +1,7 @@
 package com.sequenceiq.cloudbreak.domain;
 
-import com.sequenceiq.cloudbreak.converter.ImageTypeConverter;
-import com.sequenceiq.common.api.type.ImageType;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -18,8 +18,8 @@
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
 
-import java.util.HashSet;
-import java.util.Set;
+import com.sequenceiq.cloudbreak.converter.ImageTypeConverter;
+import com.sequenceiq.common.api.type.ImageType;
 
 @Entity
 @Table(uniqueConstraints = {
@@ -49,8 +49,6 @@ public class CustomImage implements ProvisionEntity {
     @Column(nullable = false)
     private String resourceCrn;
 
-    private String creator;
-
     private Long created = System.currentTimeMillis();
 
     @Convert(converter = ImageTypeConverter.class)
@@ -113,14 +111,6 @@ public Long getCreated() {
         return created;
     }
 
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
     public ImageType getImageType() {
         return imageType;
     }
diff --git a/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/VmImage.java b/core-model/src/main/java/com/sequenceiq/cloudbreak/domain/VmImage.java
@@ -20,8 +20,6 @@ public class VmImage implements ProvisionEntity {
     @SequenceGenerator(name = "vmimage_generator", sequenceName = "vmimage_id_seq", allocationSize = 1)
     private Long id;
 
-    private String creator;
-
     private Long created = System.currentTimeMillis();
 
     @ManyToOne
@@ -42,14 +40,6 @@ public void setId(Long id) {
         this.id = id;
     }
 
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
     public Long getCreated() {
         return created;
     }
diff --git a/core-model/src/test/java/com/sequenceiq/cloudbreak/TestUtil.java b/core-model/src/test/java/com/sequenceiq/cloudbreak/TestUtil.java
@@ -599,7 +599,6 @@ public static Blueprint blueprint(Long id, String name, String blueprintText) {
         blueprint.setStatus(ResourceStatus.DEFAULT);
         blueprint.setTags(getEmptyJson());
         blueprint.setResourceCrn("someCrn");
-        blueprint.setCreator("someone");
         return blueprint;
     }
 
diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CustomImageCatalogV4Controller.java b/core/src/main/java/com/sequenceiq/cloudbreak/controller/v4/CustomImageCatalogV4Controller.java
@@ -147,10 +147,9 @@ public CustomImageCatalogV4GetImageResponse getCustomImage(@ResourceName String
     @CheckPermissionByResourceName(action = AuthorizationResourceAction.EDIT_IMAGE_CATALOG)
     public CustomImageCatalogV4CreateImageResponse createCustomImage(@ResourceName String name,
             @Valid CustomImageCatalogV4CreateImageRequest request, @AccountId String accountId) {
-        String creator = ThreadBasedUserCrnProvider.getUserCrn();
         CustomImage customImage = customImageCatalogV4CreateImageRequestToCustomImageConverter.convert(request);
         CustomImage savedCustomImage = customImageCatalogService
-                .createCustomImage(restRequestThreadLocalService.getRequestedWorkspaceId(), accountId, creator, name, customImage);
+                .createCustomImage(restRequestThreadLocalService.getRequestedWorkspaceId(), accountId, name, customImage);
 
         return customImageToCustomImageCatalogV4CreateImageResponseConverter.convert(savedCustomImage);
     }
@@ -159,11 +158,10 @@ public CustomImageCatalogV4CreateImageResponse createCustomImage(@ResourceName S
     @CheckPermissionByResourceName(action = AuthorizationResourceAction.EDIT_IMAGE_CATALOG)
     public CustomImageCatalogV4UpdateImageResponse updateCustomImage(@ResourceName String name, String imageId,
             @Valid CustomImageCatalogV4UpdateImageRequest request, @AccountId String accountId) {
-        String creator = ThreadBasedUserCrnProvider.getUserCrn();
         CustomImage customImage = customImageCatalogV4UpdateImageRequestToCustomImageConverter.convert(request);
         customImage.setName(imageId);
         CustomImage savedCustomImage = customImageCatalogService
-                .updateCustomImage(restRequestThreadLocalService.getRequestedWorkspaceId(), creator, name, customImage);
+                .updateCustomImage(restRequestThreadLocalService.getRequestedWorkspaceId(), name, customImage);
 
         return customImageToCustomImageCatalogV4UpdateImageResponseConverter.convert(savedCustomImage);
     }
diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/init/blueprint/BlueprintLoaderService.java b/core/src/main/java/com/sequenceiq/cloudbreak/init/blueprint/BlueprintLoaderService.java
@@ -123,8 +123,7 @@ private Set<Blueprint> addMissingBlueprints(Collection<Blueprint> blueprintsInDa
             bp.setName(diffBlueprint.getValue().getName());
             bp = setupBlueprint(bp, workspace);
             String accountId = ThreadBasedUserCrnProvider.getAccountId();
-            String creator = ThreadBasedUserCrnProvider.getUserCrn();
-            blueprintService.decorateWithCrn(bp, accountId, creator);
+            blueprintService.decorateWithCrn(bp, accountId);
             resultList.add(bp);
         }
 
diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/service/blueprint/BlueprintService.java b/core/src/main/java/com/sequenceiq/cloudbreak/service/blueprint/BlueprintService.java
@@ -145,7 +145,7 @@ public Blueprint get(Long id) {
 
     public Blueprint createForLoggedInUser(Blueprint blueprint, Long workspaceId, String accountId, String creator) {
         validate(blueprint, false);
-        decorateWithCrn(blueprint, accountId, creator);
+        decorateWithCrn(blueprint, accountId);
         try {
             return transactionService.required(() -> {
                 Blueprint created = super.createForLoggedInUser(blueprint, workspaceId);
@@ -201,9 +201,8 @@ public Blueprint getByWorkspace(@NotNull NameOrCrn nameOrCrn, Long workspaceId)
                 : getByCrnAndWorkspaceIdAndAddToMdc(nameOrCrn.getCrn(), workspaceId);
     }
 
-    public void decorateWithCrn(Blueprint bp, String accountId, String creator) {
+    public void decorateWithCrn(Blueprint bp, String accountId) {
         bp.setResourceCrn(createCRN(accountId));
-        bp.setCreator(creator);
     }
 
     private Set<String> getHueHostGroups(String blueprintText) {
diff --git a/core/src/main/java/com/sequenceiq/cloudbreak/service/image/CustomImageCatalogService.java b/core/src/main/java/com/sequenceiq/cloudbreak/service/image/CustomImageCatalogService.java
@@ -93,21 +93,17 @@ public Image getSourceImage(CustomImage image) {
         }
     }
 
-    public CustomImage createCustomImage(Long workspaceId, String accountId, String creator, String imageCatalogName, CustomImage customImage) {
+    public CustomImage createCustomImage(Long workspaceId, String accountId, String imageCatalogName, CustomImage customImage) {
         String imageName = UUID.randomUUID().toString();
         LOGGER.debug(String.format("Create custom image '%s' in catalog '%s' in workspace '%d'", imageName, imageCatalogName, workspaceId));
 
         try {
             return transactionService.required(() -> {
                 ImageCatalog imageCatalog = getImageCatalog(workspaceId, imageCatalogName);
                 customImage.setName(imageName);
-                customImage.setCreator(creator);
                 customImage.setResourceCrn(regionAwareCrnGenerator.generateCrnString(CrnResourceDescriptor.IMAGE_CATALOG, imageName, accountId));
                 customImage.setImageCatalog(imageCatalog);
-                customImage.getVmImage().stream().forEach(vmImage -> {
-                    vmImage.setCustomImage(customImage);
-                    vmImage.setCreator(creator);
-                });
+                customImage.getVmImage().stream().forEach(vmImage -> vmImage.setCustomImage(customImage));
 
                 validateSourceImage(customImage);
 
@@ -142,7 +138,7 @@ public CustomImage deleteCustomImage(Long workspaceId, String imageCatalogName,
         }
     }
 
-    public CustomImage updateCustomImage(Long workspaceId, String creator, String imageCatalogName, CustomImage customImage) {
+    public CustomImage updateCustomImage(Long workspaceId, String imageCatalogName, CustomImage customImage) {
         LOGGER.debug(String.format("Update custom image '%s' in catalog '%s' in workspace '%d'",
                 customImage.getName(), imageCatalogName, workspaceId));
 
@@ -174,7 +170,6 @@ public CustomImage updateCustomImage(Long workspaceId, String creator, String im
                         }
                     }
                     for (VmImage vmImage : vmImagesToSave) {
-                        vmImage.setCreator(creator);
                         vmImage.setCustomImage(savedCustomImage);
                         savedCustomImage.getVmImage().add(vmImage);
                     }
diff --git a/core/src/test/java/com/sequenceiq/cloudbreak/controller/v4/CustomImageCatalogV4ControllerTest.java b/core/src/test/java/com/sequenceiq/cloudbreak/controller/v4/CustomImageCatalogV4ControllerTest.java
@@ -194,15 +194,13 @@ public void testCreateCustomImage() {
 
         when(customImageCatalogV4CreateImageRequestToCustomImageConverter.convert(request)).thenReturn(customImage);
         when(restRequestThreadLocalService.getRequestedWorkspaceId()).thenReturn(WORKSPACE_ID);
-        when(customImageCatalogService.createCustomImage(eq(WORKSPACE_ID), anyString(), eq(USER_CRN), eq(IMAGE_CATALOG_NAME), eq(customImage)))
+        when(customImageCatalogService.createCustomImage(eq(WORKSPACE_ID), anyString(), eq(IMAGE_CATALOG_NAME), eq(customImage)))
                 .thenReturn(savedCustomImage);
         when(customImageToCustomImageCatalogV4CreateImageResponseConverter.convert(savedCustomImage)).thenReturn(expected);
 
-        ThreadBasedUserCrnProvider.doAs(USER_CRN, () -> {
-            CustomImageCatalogV4CreateImageResponse actual = victim.createCustomImage(IMAGE_CATALOG_NAME, request, ACCOUNT_ID);
+        CustomImageCatalogV4CreateImageResponse actual = victim.createCustomImage(IMAGE_CATALOG_NAME, request, ACCOUNT_ID);
 
-            assertEquals(expected, actual);
-        });
+        assertEquals(expected, actual);
     }
 
     @Test
@@ -214,15 +212,13 @@ public void testUpdateCustomImage() {
 
         when(customImageCatalogV4UpdateImageRequestToCustomImageConverter.convert(request)).thenReturn(customImage);
         when(restRequestThreadLocalService.getRequestedWorkspaceId()).thenReturn(WORKSPACE_ID);
-        when(customImageCatalogService.updateCustomImage(eq(WORKSPACE_ID), eq(USER_CRN), eq(IMAGE_CATALOG_NAME), eq(customImage)))
+        when(customImageCatalogService.updateCustomImage(eq(WORKSPACE_ID), eq(IMAGE_CATALOG_NAME), eq(customImage)))
                 .thenReturn(savedCustomImage);
         when(customImageToCustomImageCatalogV4UpdateImageResponseConverter.convert(savedCustomImage)).thenReturn(expected);
 
-        ThreadBasedUserCrnProvider.doAs(USER_CRN, () -> {
-            CustomImageCatalogV4UpdateImageResponse actual = victim.updateCustomImage(IMAGE_CATALOG_NAME, IMAGE_ID, request, ACCOUNT_ID);
+        CustomImageCatalogV4UpdateImageResponse actual = victim.updateCustomImage(IMAGE_CATALOG_NAME, IMAGE_ID, request, ACCOUNT_ID);
 
-            assertEquals(expected, actual);
-        });
+        assertEquals(expected, actual);
     }
 
     @Test
diff --git a/core/src/test/java/com/sequenceiq/cloudbreak/service/blueprint/BlueprintServiceTest.java b/core/src/test/java/com/sequenceiq/cloudbreak/service/blueprint/BlueprintServiceTest.java
diff --git a/core/src/test/java/com/sequenceiq/cloudbreak/service/image/CustomImageCatalogServiceTest.java b/core/src/test/java/com/sequenceiq/cloudbreak/service/image/CustomImageCatalogServiceTest.java
diff --git a/environment/src/main/java/com/sequenceiq/environment/network/service/NetworkCreationRequestFactory.java b/environment/src/main/java/com/sequenceiq/environment/network/service/NetworkCreationRequestFactory.java

Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,6 @@ private NetworkCreationRequest createNetworkRequest(String networkCidr, Set<Netw`
`550`	`550`	`.withPublicSubnets(subnets)`
`551`	`551`	`.withPrivateSubnetEnabled(true)`
`552`	`552`	`.withUserName("[email protected]")`
`553`		`- .withCreatorCrn("user-crn")`
`554`	`553`	`.build();`
`555`	`554`	`}`
`556`	`555`
Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,6 @@ public static Blueprint blueprint(Long id, String name, String blueprintText) {`
`465`	`465`	`blueprint.setStatus(ResourceStatus.DEFAULT);`
`466`	`466`	`blueprint.setTags(getEmptyJson());`
`467`	`467`	`blueprint.setResourceCrn("someCrn");`
`468`		`- blueprint.setCreator("someone");`
`469`	`468`	`return blueprint;`
`470`	`469`	`}`
`471`	`470`
Original file line number	Diff line number	Diff line change
`@@ -599,7 +599,6 @@ public static Blueprint blueprint(Long id, String name, String blueprintText) {`
`599`	`599`	`blueprint.setStatus(ResourceStatus.DEFAULT);`
`600`	`600`	`blueprint.setTags(getEmptyJson());`
`601`	`601`	`blueprint.setResourceCrn("someCrn");`
`602`		`- blueprint.setCreator("someone");`
`603`	`602`	`return blueprint;`
`604`	`603`	`}`
`605`	`604`
Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,7 @@ private Set<Blueprint> addMissingBlueprints(Collection<Blueprint> blueprintsInDa`
`123`	`123`	`bp.setName(diffBlueprint.getValue().getName());`
`124`	`124`	`bp = setupBlueprint(bp, workspace);`
`125`	`125`	`String accountId = ThreadBasedUserCrnProvider.getAccountId();`
`126`		`- String creator = ThreadBasedUserCrnProvider.getUserCrn();`
`127`		`- blueprintService.decorateWithCrn(bp, accountId, creator);`
	`126`	`+ blueprintService.decorateWithCrn(bp, accountId);`
`128`	`127`	`resultList.add(bp);`
`129`	`128`	`}`
`130`	`129`
Original file line number	Diff line number	Diff line change
`@@ -93,21 +93,17 @@ public Image getSourceImage(CustomImage image) {`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`- public CustomImage createCustomImage(Long workspaceId, String accountId, String creator, String imageCatalogName, CustomImage customImage) {`
	`96`	`+ public CustomImage createCustomImage(Long workspaceId, String accountId, String imageCatalogName, CustomImage customImage) {`
`97`	`97`	`String imageName = UUID.randomUUID().toString();`
`98`	`98`	`LOGGER.debug(String.format("Create custom image '%s' in catalog '%s' in workspace '%d'", imageName, imageCatalogName, workspaceId));`
`99`	`99`
`100`	`100`	`try {`
`101`	`101`	`return transactionService.required(() -> {`
`102`	`102`	`ImageCatalog imageCatalog = getImageCatalog(workspaceId, imageCatalogName);`
`103`	`103`	`customImage.setName(imageName);`
`104`		`- customImage.setCreator(creator);`
`105`	`104`	`customImage.setResourceCrn(regionAwareCrnGenerator.generateCrnString(CrnResourceDescriptor.IMAGE_CATALOG, imageName, accountId));`
`106`	`105`	`customImage.setImageCatalog(imageCatalog);`
`107`		`- customImage.getVmImage().stream().forEach(vmImage -> {`
`108`		`- vmImage.setCustomImage(customImage);`
`109`		`- vmImage.setCreator(creator);`
`110`		`- });`
	`106`	`+ customImage.getVmImage().stream().forEach(vmImage -> vmImage.setCustomImage(customImage));`
`111`	`107`
`112`	`108`	`validateSourceImage(customImage);`
`113`	`109`
`@@ -142,7 +138,7 @@ public CustomImage deleteCustomImage(Long workspaceId, String imageCatalogName,`
`142`	`138`	`}`
`143`	`139`	`}`
`144`	`140`
`145`		`- public CustomImage updateCustomImage(Long workspaceId, String creator, String imageCatalogName, CustomImage customImage) {`
	`141`	`+ public CustomImage updateCustomImage(Long workspaceId, String imageCatalogName, CustomImage customImage) {`
`146`	`142`	`LOGGER.debug(String.format("Update custom image '%s' in catalog '%s' in workspace '%d'",`
`147`	`143`	`customImage.getName(), imageCatalogName, workspaceId));`
`148`	`144`
`@@ -174,7 +170,6 @@ public CustomImage updateCustomImage(Long workspaceId, String creator, String im`
`174`	`170`	`}`
`175`	`171`	`}`
`176`	`172`	`for (VmImage vmImage : vmImagesToSave) {`
`177`		`- vmImage.setCreator(creator);`
`178`	`173`	`vmImage.setCustomImage(savedCustomImage);`
`179`	`174`	`savedCustomImage.getVmImage().add(vmImage);`
`180`	`175`	`}`