desiredTags = getNewDesiredTags(handlerRequest);
+ return ObjectUtils.notEqual(previousTags, desiredTags);
+ }
+
+ /**
+ * getPreviouslyAttachedTags
+ *
+ * If stack tags and resource tags are not merged together in Configuration class, we will
+ * get previously attached system (with `aws:cloudformation` prefix) and web app defined tags from
+ * handlerRequest.getPreviousSystemTags() (system tags),
+ * handlerRequest.getPreviousResourceTags() (stack tags),
+ * handlerRequest.getPreviousResourceState().getTags() (resource tags).
+ *
+ *
System tags are an optional feature. Merge them to your tags if you have enabled them for
+ * your resource. System tags can change on resource update if the resource is imported to the
+ * stack.
+ */
+ public static Map getPreviouslyAttachedTags(
+ final ResourceHandlerRequest handlerRequest) {
+ final Map previousTags = new HashMap<>();
+
+ if (handlerRequest.getPreviousSystemTags() != null) {
+ previousTags.putAll(handlerRequest.getPreviousSystemTags());
+ }
+
+ if (handlerRequest.getPreviousResourceTags() != null) {
+ previousTags.putAll(handlerRequest.getPreviousResourceTags());
+ }
+
+ ResourceModel model = handlerRequest.getPreviousResourceState();
+ if (model != null && model.getTags() != null) {
+ model.getTags().forEach(tag -> {
+ previousTags.put(tag.getKey(), tag.getValue());
+ });
+ }
+ return previousTags;
+ }
+
+ /**
+ * getNewDesiredTags
+ *
+ * If stack tags and resource tags are not merged together in Configuration class, we will
+ * get new desired system (with `aws:cloudformation` prefix) and web app defined tags from
+ * handlerRequest.getSystemTags() (system tags), handlerRequest.getDesiredResourceTags() (stack
+ * tags), handlerRequest.getDesiredResourceState().getTags() (resource tags).
+ *
+ *
System tags are an optional feature. Merge them to your tags if you have enabled them for
+ * your resource. System tags can change on resource update if the resource is imported to the
+ * stack.
+ */
+ public static Map getNewDesiredTags(final ResourceHandlerRequest handlerRequest) {
+ final Map desiredTags = new HashMap<>();
+
+ if (handlerRequest.getSystemTags() != null) {
+ desiredTags.putAll(handlerRequest.getSystemTags());
+ }
+
+ // get desired stack level tags from handlerRequest
+ if (handlerRequest.getDesiredResourceTags() != null) {
+ desiredTags.putAll(handlerRequest.getDesiredResourceTags());
+ }
+
+ if (handlerRequest.getDesiredResourceState().getTags() != null) {
+ handlerRequest.getDesiredResourceState().getTags().forEach(tag -> {
+ desiredTags.put(tag.getKey(), tag.getValue());
+ });
+ }
+ return desiredTags;
+ }
+
+ /**
+ * generateTagsToAdd
+ *
+ * Determines the tags the customer desired to define or redefine.
+ */
+ public static Map generateTagsToAdd(
+ final Map previousTags, final Map desiredTags) {
+ return desiredTags.entrySet().stream()
+ .filter(e -> !previousTags.containsKey(e.getKey())
+ || !Objects.equals(previousTags.get(e.getKey()), e.getValue()))
+ .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+ }
+
+ /**
+ * getTagsToRemove
+ *
+ * Determines the tags the customer desired to remove from the function.
+ */
+ public static Set generateTagsToRemove(
+ final Map previousTags, final Map desiredTags) {
+ final Set desiredTagNames = desiredTags.keySet();
+
+ return previousTags.keySet().stream()
+ .filter(tagName -> !desiredTagNames.contains(tagName))
+ .collect(Collectors.toSet());
+ }
+
+ public static void setDesiredTags(
+ ResourceHandlerRequest request, ResourceModel desiredResourceModel) {
+
+ Map tagsMap = getNewDesiredTags(request);
+ if (!tagsMap.isEmpty()) {
+ desiredResourceModel.setTags(Translator.translateTagMapToTagList(tagsMap));
+ }
+ }
+}
diff --git a/aws-transfer-webapp/src/main/java/software/amazon/transfer/webapp/translators/Translator.java b/aws-transfer-webapp/src/main/java/software/amazon/transfer/webapp/translators/Translator.java
new file mode 100644
index 0000000..ee85f5a
--- /dev/null
+++ b/aws-transfer-webapp/src/main/java/software/amazon/transfer/webapp/translators/Translator.java
@@ -0,0 +1,144 @@
+package software.amazon.transfer.webapp.translators;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.StringUtils;
+
+import software.amazon.awssdk.services.transfer.model.DescribeWebAppRequest;
+import software.amazon.awssdk.services.transfer.model.TagResourceRequest;
+import software.amazon.awssdk.services.transfer.model.UntagResourceRequest;
+import software.amazon.transfer.webapp.ResourceModel;
+import software.amazon.transfer.webapp.Tag;
+
+/**
+ * This class is a centralized placeholder for - api request construction - object translation
+ * to/from aws sdk - resource model construction for read/list handlers
+ */
+public final class Translator {
+ private Translator() {}
+
+ public static List translateToSdkTags(List tags) {
+ return streamOfOrEmpty(tags)
+ .map(tag -> software.amazon.awssdk.services.transfer.model.Tag.builder()
+ .key(tag.getKey())
+ .value(tag.getValue())
+ .build())
+ .toList();
+ }
+
+ public static List translateToSdkTags(
+ Map tags) {
+ if (tags == null) {
+ return null;
+ }
+ return tags.entrySet().stream()
+ .map(tag -> software.amazon.awssdk.services.transfer.model.Tag.builder()
+ .key(tag.getKey())
+ .value(tag.getValue())
+ .build())
+ .toList();
+ }
+
+ /**
+ * Request to read a resource
+ *
+ * @param model resource model
+ * @return awsRequest the aws service request to describe a resource
+ */
+ public static DescribeWebAppRequest translateToReadRequest(final ResourceModel model) {
+ return DescribeWebAppRequest.builder().webAppId(model.getWebAppId()).build();
+ }
+
+ public static List translateFromSdkTags(List tags) {
+ if (tags == null) {
+ return null;
+ }
+ return tags.stream()
+ .map(tag -> Tag.builder().key(tag.key()).value(tag.value()).build())
+ .toList();
+ }
+
+ public static List translateTagMapToTagList(Map tagMap) {
+ if (tagMap == null) {
+ return null;
+ }
+ return tagMap.entrySet().stream()
+ .map(entry -> Tag.builder()
+ .key(entry.getKey())
+ .value(entry.getValue())
+ .build())
+ .toList();
+ }
+
+ public static Map translateTagListToTagMap(List tagList) {
+ if (tagList == null) {
+ return null;
+ }
+ return tagList.stream().collect(Collectors.toMap(Tag::getKey, Tag::getValue));
+ }
+
+ public static Stream streamOfOrEmpty(final Collection collection) {
+ if (collection == null) {
+ return Stream.empty();
+ }
+ return collection.stream();
+ }
+
+ public static String emptyStringIfNull(String nullableString) {
+ if (nullableString == null) {
+ return "";
+ }
+ return nullableString;
+ }
+
+ public static List nullIfEmptyList(final List list) {
+ if (list == null || list.isEmpty()) {
+ return null;
+ }
+ return list;
+ }
+
+ public static List emptyListIfNull(final List list) {
+ if (list == null) {
+ return List.of();
+ }
+ return list;
+ }
+
+ /**
+ * Request to add tags to a resource
+ *
+ * @param model resource model
+ * @return awsRequest the aws service request to create a resource
+ */
+ public static TagResourceRequest tagResourceRequest(
+ final ResourceModel model, final Map addedTags) {
+ List tagsToAdd = translateToSdkTags(addedTags);
+ return TagResourceRequest.builder().arn(model.getArn()).tags(tagsToAdd).build();
+ }
+
+ /**
+ * Request to add tags to a resource
+ *
+ * @param model resource model
+ * @return awsRequest the aws service request to create a resource
+ */
+ public static UntagResourceRequest untagResourceRequest(final ResourceModel model, final Set removedTags) {
+ return UntagResourceRequest.builder()
+ .arn(model.getArn())
+ .tagKeys(removedTags)
+ .build();
+ }
+
+ public static void ensureWebAppIdInModel(ResourceModel model) {
+ if (StringUtils.isBlank(model.getWebAppId())) {
+ WebAppArn webAppArn = WebAppArn.fromString(model.getArn());
+ model.setWebAppId(webAppArn.getWebAppId());
+ }
+ }
+}
diff --git a/aws-transfer-webapp/src/main/java/software/amazon/transfer/webapp/translators/WebAppArn.java b/aws-transfer-webapp/src/main/java/software/amazon/transfer/webapp/translators/WebAppArn.java
new file mode 100644
index 0000000..8dfd7eb
--- /dev/null
+++ b/aws-transfer-webapp/src/main/java/software/amazon/transfer/webapp/translators/WebAppArn.java
@@ -0,0 +1,46 @@
+package software.amazon.transfer.webapp.translators;
+
+import com.amazonaws.arn.Arn;
+import com.amazonaws.regions.Region;
+import com.amazonaws.regions.RegionUtils;
+
+/** ARN representing a web app. */
+public class WebAppArn extends BaseArn {
+ /** Number of parts delimited by {@link #RESOURCE_DELIMITER} in relativeId of ARN. */
+ private static final int RELATIVE_ID_PARTS = 2;
+ /** Web app resource type. */
+ static final String WEB_APP = "webapp";
+
+ private final String webAppId;
+
+ public WebAppArn(Region region, String accountId, String webAppId) {
+ super(region, accountId);
+ this.webAppId = webAppId;
+ }
+
+ public String getResourceType() {
+ return WEB_APP;
+ }
+
+ public String getResourceId() {
+ return webAppId;
+ }
+
+ public String getWebAppId() {
+ return webAppId;
+ }
+
+ public static WebAppArn fromString(String arn) {
+ return fromArn(Arn.fromString(arn));
+ }
+
+ public static WebAppArn fromArn(Arn arn) {
+ String[] relativeIdParts = getRelativeIdParts(arn);
+ if (relativeIdParts.length != RELATIVE_ID_PARTS || !relativeIdParts[0].equals(WEB_APP)) {
+ throw new IllegalArgumentException("Invalid Web App ARN: " + arn);
+ }
+
+ Region r = RegionUtils.getRegion(arn.getRegion());
+ return new WebAppArn(r, arn.getAccountId(), relativeIdParts[1]);
+ }
+}
diff --git a/aws-transfer-webapp/src/resources/log4j2.xml b/aws-transfer-webapp/src/resources/log4j2.xml
new file mode 100644
index 0000000..5657daf
--- /dev/null
+++ b/aws-transfer-webapp/src/resources/log4j2.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/AbstractTestBase.java b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/AbstractTestBase.java
new file mode 100644
index 0000000..c030291
--- /dev/null
+++ b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/AbstractTestBase.java
@@ -0,0 +1,271 @@
+package software.amazon.transfer.webapp;
+
+import static org.mockito.Mockito.mock;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.time.Duration;
+import java.util.Base64;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.mockito.Mock;
+
+import software.amazon.awssdk.awscore.AwsRequest;
+import software.amazon.awssdk.awscore.AwsResponse;
+import software.amazon.awssdk.core.ResponseBytes;
+import software.amazon.awssdk.core.ResponseInputStream;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.services.transfer.TransferClient;
+import software.amazon.awssdk.services.transfer.model.DescribeWebAppCustomizationResponse;
+import software.amazon.awssdk.services.transfer.model.DescribeWebAppResponse;
+import software.amazon.awssdk.services.transfer.model.DescribedWebApp;
+import software.amazon.awssdk.services.transfer.model.DescribedWebAppCustomization;
+import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy;
+import software.amazon.cloudformation.proxy.Credentials;
+import software.amazon.cloudformation.proxy.LoggerProxy;
+import software.amazon.cloudformation.proxy.ProxyClient;
+import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
+import software.amazon.transfer.webapp.translators.Translator;
+
+public abstract class AbstractTestBase {
+ public static final String TEST_APPLICATION_ARN =
+ "arn:aws:sso::123456789012:application/ins-abcd1234efgh5678/apl-1234567890abcdef";
+ public static final String TEST_INSTANCE_ARN = "arn:aws:sso:::instance/ins-abcd1234efgh5678";
+ public static final String TEST_ROLE = "arn:aws:iam::123456789012:role/test-role";
+ public static final String TEST_CUSTOMIZATION_TITLE = "Test Web App Customization Title";
+ public static final String TEST_CUSTOMIZATION_LOGO_FILE = loadTestFile("logo.png");
+ public static final String TEST_CUSTOMIZATION_FAVICON_FILE = loadTestFile("favicon.png");
+ public static final Integer TEST_PROVISIONED = 3;
+ public static final String TEST_ARN = "arn:aws:transfer:us-east-1:123456789012:webapp/webapp-12345678901234567";
+ public static final String TEST_WEB_APP_ID = "webapp-12345678901234567";
+ public static final String TEST_ACCESS_ENDPOINT = "https://x7k9pq4mnt5wy.cloudfront.net";
+ protected static final Map RESOURCE_TAG_MAP = Collections.singletonMap("key", "value");
+ protected static final Map TEST_TAG_MAP = ImmutableMap.of("key2", "value2");
+ protected static final Map SYSTEM_TAG_MAP =
+ Collections.singletonMap("aws:cloudformation:stack-name", "StackName");
+ protected static final List MODEL_TAGS =
+ ImmutableList.of(Tag.builder().key("key").value("value").build());
+ protected static final Map EXTRA_MODEL_TAGS = ImmutableMap.of("extrakey", "extravalue");
+ protected static final software.amazon.awssdk.services.transfer.model.Tag SDK_MODEL_TAG =
+ software.amazon.awssdk.services.transfer.model.Tag.builder()
+ .key("key")
+ .value("value")
+ .build();
+ protected static final software.amazon.awssdk.services.transfer.model.Tag SDK_SYSTEM_TAG =
+ software.amazon.awssdk.services.transfer.model.Tag.builder()
+ .key("aws:cloudformation:stack-name")
+ .value("StackName")
+ .build();
+
+ public static IdentityProviderDetails getIdentityProviderDetails() {
+ return IdentityProviderDetails.builder()
+ .applicationArn(TEST_APPLICATION_ARN)
+ .instanceArn(TEST_INSTANCE_ARN)
+ .role(TEST_ROLE)
+ .build();
+ }
+
+ public static WebAppUnits getWebAppUnits() {
+ return WebAppUnits.builder().provisioned(TEST_PROVISIONED).build();
+ }
+
+ public static WebAppCustomization getWebAppCustomization() {
+ return WebAppCustomization.builder()
+ .title(TEST_CUSTOMIZATION_TITLE)
+ .logoFile(TEST_CUSTOMIZATION_LOGO_FILE)
+ .faviconFile(TEST_CUSTOMIZATION_FAVICON_FILE)
+ .build();
+ }
+
+ protected static final Credentials MOCK_CREDENTIALS;
+ protected static final LoggerProxy logger;
+
+ static {
+ MOCK_CREDENTIALS = new Credentials("accessKey", "secretKey", "token");
+ logger = new LoggerProxy();
+ }
+
+ protected AmazonWebServicesClientProxy proxy;
+
+ protected ProxyClient proxyClient;
+
+ @Mock
+ protected TransferClient client;
+
+ @BeforeEach
+ public void setup() {
+ proxy = new AmazonWebServicesClientProxy(
+ logger, MOCK_CREDENTIALS, () -> Duration.ofSeconds(600).toMillis());
+ client = mock(TransferClient.class);
+ proxyClient = MOCK_PROXY(proxy, client);
+ }
+
+ static ProxyClient MOCK_PROXY(final AmazonWebServicesClientProxy proxy, final T sdkClient) {
+ return new ProxyClient() {
+ @Override
+ public ResponseT injectCredentialsAndInvokeV2(
+ RequestT request, Function requestFunction) {
+ return proxy.injectCredentialsAndInvokeV2(request, requestFunction);
+ }
+
+ @Override
+ public
+ CompletableFuture injectCredentialsAndInvokeV2Async(
+ RequestT request, Function> requestFunction) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public <
+ RequestT extends AwsRequest,
+ ResponseT extends AwsResponse,
+ IterableT extends SdkIterable>
+ IterableT injectCredentialsAndInvokeIterableV2(
+ RequestT request, Function requestFunction) {
+ return proxy.injectCredentialsAndInvokeIterableV2(request, requestFunction);
+ }
+
+ @Override
+ public
+ ResponseInputStream injectCredentialsAndInvokeV2InputStream(
+ RequestT requestT, Function> function) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public
+ ResponseBytes injectCredentialsAndInvokeV2Bytes(
+ RequestT requestT, Function> function) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public T client() {
+ return sdkClient;
+ }
+ };
+ }
+
+ protected static ResourceHandlerRequest.ResourceHandlerRequestBuilder requestBuilder() {
+ return ResourceHandlerRequest.builder()
+ .awsAccountId("123456789012")
+ .awsPartition("aws")
+ .region("us-east-1");
+ }
+
+ protected ResourceModel simpleWebAppModel() {
+ return ResourceModel.builder()
+ .webAppId(TEST_WEB_APP_ID)
+ .identityProviderDetails(getIdentityProviderDetails())
+ .webAppUnits(WebAppUnits.builder().provisioned(1).build())
+ .tags(Collections.emptyList())
+ .build();
+ }
+
+ protected ResourceModel fullyLoadedWebAppModel() {
+ return ResourceModel.builder()
+ .identityProviderDetails(getIdentityProviderDetails())
+ .accessEndpoint(TEST_ACCESS_ENDPOINT)
+ .webAppUnits(getWebAppUnits())
+ .webAppCustomization(getWebAppCustomization())
+ .tags(MODEL_TAGS)
+ .build();
+ }
+
+ protected DescribeWebAppResponse describeWebAppResponseFromModel(ResourceModel model) {
+ software.amazon.awssdk.services.transfer.model.WebAppUnits webAppUnits =
+ software.amazon.awssdk.services.transfer.model.WebAppUnits.builder()
+ .provisioned(
+ model.getWebAppUnits() != null
+ ? model.getWebAppUnits().getProvisioned()
+ : 1) // Default to 1 if not provided
+ .build();
+
+ software.amazon.transfer.webapp.WebAppUnits modelWebAppUnits =
+ software.amazon.transfer.webapp.WebAppUnits.builder()
+ .provisioned(webAppUnits.provisioned())
+ .build();
+ model.setWebAppUnits(modelWebAppUnits);
+
+ IdentityProviderDetails currentModel = model.getIdentityProviderDetails();
+ IdentityProviderDetails identityProviderDetails = IdentityProviderDetails.builder()
+ .applicationArn(TEST_APPLICATION_ARN)
+ .instanceArn(currentModel.getInstanceArn())
+ .role(currentModel.getRole())
+ .build();
+ model.setIdentityProviderDetails(identityProviderDetails);
+
+ return DescribeWebAppResponse.builder()
+ .webApp(
+ DescribedWebApp.builder()
+ .webAppId(model.getWebAppId())
+ .accessEndpoint(model.getAccessEndpoint())
+ .arn(model.getArn())
+ .describedIdentityProviderDetails(
+ software.amazon.awssdk.services.transfer.model
+ .DescribedWebAppIdentityProviderDetails.builder()
+ .identityCenterConfig(software.amazon.awssdk.services.transfer.model
+ .DescribedIdentityCenterConfig.builder()
+ .applicationArn(model.getIdentityProviderDetails()
+ .getApplicationArn())
+ .instanceArn(model.getIdentityProviderDetails()
+ .getInstanceArn())
+ .role(model.getIdentityProviderDetails()
+ .getRole())
+ .build())
+ .build())
+ .webAppUnits(webAppUnits)
+ .tags(Translator.translateToSdkTags(model.getTags()))
+ .build())
+ .build();
+ }
+
+ protected DescribeWebAppCustomizationResponse describeWebAppCustomizationResponseFromModel(ResourceModel model) {
+ return DescribeWebAppCustomizationResponse.builder()
+ .webAppCustomization(DescribedWebAppCustomization.builder()
+ .title(model.getWebAppCustomization().getTitle())
+ .logoFile(convertFromBase64String(
+ model.getWebAppCustomization().getLogoFile()))
+ .faviconFile(convertFromBase64String(
+ model.getWebAppCustomization().getFaviconFile()))
+ .build())
+ .build();
+ }
+
+ protected static String loadTestFile(String resourcePath) {
+ try {
+ // Get file from resources folder
+ ClassLoader classLoader = AbstractTestBase.class.getClassLoader();
+ InputStream inputStream = classLoader.getResourceAsStream(resourcePath);
+
+ if (inputStream == null) {
+ throw new IllegalArgumentException("File not found: " + resourcePath);
+ }
+
+ // Read the file bytes
+ byte[] fileBytes = inputStream.readAllBytes();
+ inputStream.close();
+
+ // Convert to Base64
+ return Base64.getEncoder().encodeToString(fileBytes);
+ } catch (IOException e) {
+ throw new RuntimeException("Failed to load test file: " + resourcePath, e);
+ }
+ }
+
+ private SdkBytes convertFromBase64String(String base64String) {
+ if (base64String == null) {
+ return null;
+ }
+ return SdkBytes.fromByteArray(Base64.getDecoder().decode(base64String));
+ }
+}
diff --git a/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/BaseHandlerStdTest.java b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/BaseHandlerStdTest.java
new file mode 100644
index 0000000..ba301f1
--- /dev/null
+++ b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/BaseHandlerStdTest.java
@@ -0,0 +1,56 @@
+package software.amazon.transfer.webapp;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import software.amazon.awssdk.services.transfer.TransferClient;
+import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy;
+import software.amazon.cloudformation.proxy.Logger;
+import software.amazon.cloudformation.proxy.ProgressEvent;
+import software.amazon.cloudformation.proxy.ProxyClient;
+import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
+
+@ExtendWith(MockitoExtension.class)
+public class BaseHandlerStdTest {
+ @Mock
+ private AmazonWebServicesClientProxy proxy;
+
+ static class MockTestHandler extends BaseHandlerStd {
+ @Override
+ public ProgressEvent handleRequest(
+ AmazonWebServicesClientProxy proxy,
+ ResourceHandlerRequest request,
+ CallbackContext callbackContext,
+ ProxyClient proxyClient,
+ Logger logger) {
+ assertNotNull(callbackContext);
+ return null;
+ }
+ }
+
+ @Test
+ void justToCover3LinesOfCode() {
+ var uut = new MockTestHandler();
+
+ // Check with null CallbackContext
+ uut.handleRequest(proxy, null, null, null);
+ verify(proxy, times(1)).newProxy(any());
+ verifyNoMoreInteractions(proxy);
+ reset(proxy);
+
+ // Check with non-null CallbackContext
+ uut.handleRequest(proxy, null, new CallbackContext(), null);
+ verify(proxy, times(1)).newProxy(any());
+ verifyNoMoreInteractions(proxy);
+ reset(proxy);
+ }
+}
diff --git a/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/CreateHandlerTest.java b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/CreateHandlerTest.java
new file mode 100644
index 0000000..7efaa80
--- /dev/null
+++ b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/CreateHandlerTest.java
@@ -0,0 +1,141 @@
+package software.amazon.transfer.webapp;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.verify;
+
+import org.assertj.core.api.SoftAssertions;
+import org.assertj.core.api.junit.jupiter.InjectSoftAssertions;
+import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import software.amazon.awssdk.services.transfer.model.CreateWebAppRequest;
+import software.amazon.awssdk.services.transfer.model.CreateWebAppResponse;
+import software.amazon.awssdk.services.transfer.model.DescribeWebAppCustomizationRequest;
+import software.amazon.awssdk.services.transfer.model.DescribeWebAppRequest;
+import software.amazon.awssdk.services.transfer.model.DescribeWebAppResponse;
+import software.amazon.awssdk.services.transfer.model.InvalidRequestException;
+import software.amazon.awssdk.services.transfer.model.ThrottlingException;
+import software.amazon.awssdk.services.transfer.model.UpdateWebAppCustomizationRequest;
+import software.amazon.awssdk.services.transfer.model.UpdateWebAppCustomizationResponse;
+import software.amazon.cloudformation.proxy.OperationStatus;
+import software.amazon.cloudformation.proxy.ProgressEvent;
+import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
+
+@ExtendWith(MockitoExtension.class)
+@ExtendWith(SoftAssertionsExtension.class)
+public class CreateHandlerTest extends AbstractTestBase {
+
+ @InjectSoftAssertions
+ private SoftAssertions softly;
+
+ private final CreateHandler handler = new CreateHandler();
+
+ @Test
+ public void handleRequest_SimpleSuccess() {
+ final ResourceModel model = simpleWebAppModel();
+ model.setWebAppId(TEST_WEB_APP_ID);
+ model.setArn(TEST_ARN);
+ model.setAccessEndpoint(TEST_ACCESS_ENDPOINT);
+
+ final ResourceHandlerRequest request =
+ requestBuilder().desiredResourceState(model).build();
+
+ setupCreateWebAppResponse();
+
+ DescribeWebAppResponse describeResponse = describeWebAppResponseFromModel(model);
+ doReturn(describeResponse).when(client).describeWebApp(any(DescribeWebAppRequest.class));
+
+ ProgressEvent response =
+ handler.handleRequest(proxy, request, new CallbackContext(), proxyClient, logger);
+
+ assertThat(response).isNotNull();
+ softly.assertThat(response.getStatus()).isEqualTo(OperationStatus.SUCCESS);
+ softly.assertThat(response.getCallbackDelaySeconds()).isEqualTo(0);
+ softly.assertThat(response.getResourceModel()).isEqualTo(model);
+ softly.assertThat(response.getResourceModels()).isNull();
+ softly.assertThat(response.getMessage()).isNull();
+ softly.assertThat(response.getErrorCode()).isNull();
+
+ verify(client, atLeastOnce()).createWebApp(any(CreateWebAppRequest.class));
+ verify(client, atLeastOnce()).describeWebApp(any(DescribeWebAppRequest.class));
+ }
+
+ @Test
+ public void handleRequest_LoadedSuccess() {
+ final ResourceModel model = fullyLoadedWebAppModel();
+ model.setWebAppId(TEST_WEB_APP_ID);
+ model.setArn(TEST_ARN);
+
+ final ResourceHandlerRequest request =
+ requestBuilder().desiredResourceState(model).build();
+
+ setupCreateWebAppResponse();
+
+ UpdateWebAppCustomizationResponse updateResponse = UpdateWebAppCustomizationResponse.builder()
+ .webAppId(TEST_WEB_APP_ID)
+ .build();
+ doReturn(updateResponse).when(client).updateWebAppCustomization(any(UpdateWebAppCustomizationRequest.class));
+
+ DescribeWebAppResponse describeResponse = describeWebAppResponseFromModel(model);
+
+ doReturn(describeResponse).when(client).describeWebApp(any(DescribeWebAppRequest.class));
+
+ doReturn(describeWebAppCustomizationResponseFromModel(model))
+ .when(client)
+ .describeWebAppCustomization(any(DescribeWebAppCustomizationRequest.class));
+
+ ProgressEvent response =
+ handler.handleRequest(proxy, request, new CallbackContext(), proxyClient, logger);
+
+ assertThat(response).isNotNull();
+ softly.assertThat(response.getStatus()).isEqualTo(OperationStatus.SUCCESS);
+ softly.assertThat(response.getCallbackDelaySeconds()).isEqualTo(0);
+ softly.assertThat(response.getResourceModel()).isEqualTo(model);
+ softly.assertThat(response.getResourceModels()).isNull();
+ softly.assertThat(response.getMessage()).isNull();
+ softly.assertThat(response.getErrorCode()).isNull();
+
+ verify(client, atLeastOnce()).createWebApp(any(CreateWebAppRequest.class));
+ verify(client, atLeastOnce()).updateWebAppCustomization(any(UpdateWebAppCustomizationRequest.class));
+ verify(client, atLeastOnce()).describeWebApp(any(DescribeWebAppRequest.class));
+ verify(client, atLeastOnce()).describeWebAppCustomization(any(DescribeWebAppCustomizationRequest.class));
+ }
+
+ @Test
+ public void errorPathsTest() {
+ final ResourceModel model = simpleWebAppModel();
+
+ final ResourceHandlerRequest request =
+ requestBuilder().desiredResourceState(model).build();
+
+ setupCreateWebAppResponse();
+
+ Exception ex1 = ThrottlingException.builder().build();
+ Exception ex2 = InvalidRequestException.builder().build();
+
+ doThrow(ex1).doThrow(ex2).when(client).describeWebApp(any(DescribeWebAppRequest.class));
+
+ ProgressEvent response =
+ handler.handleRequest(proxy, request, new CallbackContext(), proxyClient, logger);
+
+ assertThat(response).isNotNull();
+ softly.assertThat(response.getStatus()).isEqualTo(OperationStatus.FAILED);
+
+ response = handler.handleRequest(proxy, request, new CallbackContext(), proxyClient, logger);
+
+ assertThat(response).isNotNull();
+ softly.assertThat(response.getStatus()).isEqualTo(OperationStatus.FAILED);
+ }
+
+ private void setupCreateWebAppResponse() {
+ CreateWebAppResponse createWebAppResponse =
+ CreateWebAppResponse.builder().webAppId(TEST_WEB_APP_ID).build();
+ doReturn(createWebAppResponse).when(client).createWebApp(any(CreateWebAppRequest.class));
+ }
+}
diff --git a/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/DeleteHandlerTest.java b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/DeleteHandlerTest.java
new file mode 100644
index 0000000..6aa92b3
--- /dev/null
+++ b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/DeleteHandlerTest.java
@@ -0,0 +1,49 @@
+package software.amazon.transfer.webapp;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import software.amazon.awssdk.services.transfer.model.DeleteWebAppRequest;
+import software.amazon.awssdk.services.transfer.model.DeleteWebAppResponse;
+import software.amazon.cloudformation.proxy.OperationStatus;
+import software.amazon.cloudformation.proxy.ProgressEvent;
+import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
+
+@ExtendWith(MockitoExtension.class)
+public class DeleteHandlerTest extends AbstractTestBase {
+
+ @Test
+ public void handleRequest_SimpleSuccess() {
+ final DeleteHandler handler = new DeleteHandler();
+
+ final ResourceModel model = ResourceModel.builder().arn(TEST_ARN).build();
+
+ final ResourceHandlerRequest request =
+ requestBuilder().desiredResourceState(model).build();
+
+ DeleteWebAppResponse deleteWebAppResponse =
+ DeleteWebAppResponse.builder().build();
+
+ doReturn(deleteWebAppResponse).when(client).deleteWebApp(any(DeleteWebAppRequest.class));
+
+ final ProgressEvent response =
+ handler.handleRequest(proxy, request, new CallbackContext(), proxyClient, logger);
+
+ assertThat(response).isNotNull();
+ assertThat(response.getStatus()).isEqualTo(OperationStatus.SUCCESS);
+ assertThat(response.getCallbackContext()).isNull();
+ assertThat(response.getCallbackDelaySeconds()).isEqualTo(0);
+ assertThat(response.getResourceModels()).isNull();
+ assertThat(response.getMessage()).isNull();
+ assertThat(response.getErrorCode()).isNull();
+
+ verify(client, atLeastOnce()).deleteWebApp(any(DeleteWebAppRequest.class));
+ }
+}
diff --git a/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/ListHandlerTest.java b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/ListHandlerTest.java
new file mode 100644
index 0000000..1ac249f
--- /dev/null
+++ b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/ListHandlerTest.java
@@ -0,0 +1,66 @@
+package software.amazon.transfer.webapp;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+
+import org.assertj.core.api.SoftAssertions;
+import org.assertj.core.api.junit.jupiter.InjectSoftAssertions;
+import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import software.amazon.awssdk.services.transfer.model.ListWebAppsRequest;
+import software.amazon.awssdk.services.transfer.model.ListWebAppsResponse;
+import software.amazon.awssdk.services.transfer.model.ListedWebApp;
+import software.amazon.cloudformation.proxy.OperationStatus;
+import software.amazon.cloudformation.proxy.ProgressEvent;
+import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
+
+@ExtendWith(MockitoExtension.class)
+@ExtendWith(SoftAssertionsExtension.class)
+public class ListHandlerTest extends AbstractTestBase {
+
+ @InjectSoftAssertions
+ private SoftAssertions softly;
+
+ @Test
+ public void handleRequest_SimpleSuccess() {
+ final ListHandler handler = new ListHandler();
+
+ final ResourceModel model = simpleWebAppModel();
+
+ final ResourceHandlerRequest request =
+ requestBuilder().desiredResourceState(model).build();
+
+ ListWebAppsResponse listWebAppsResponse = ListWebAppsResponse.builder()
+ .webApps(ListedWebApp.builder()
+ .arn(TEST_ARN)
+ .webAppId(TEST_WEB_APP_ID)
+ .build())
+ .build();
+ doReturn(listWebAppsResponse).when(client).listWebApps(any(ListWebAppsRequest.class));
+
+ final ProgressEvent response =
+ handler.handleRequest(proxy, request, new CallbackContext(), proxyClient, logger);
+
+ assertThat(response).isNotNull();
+ assertThat(response.getResourceModels()).isNotNull();
+ assertThat(response.getResourceModels()).size().isEqualTo(1);
+ softly.assertThat(response.getStatus()).isEqualTo(OperationStatus.SUCCESS);
+ softly.assertThat(response.getCallbackContext()).isNull();
+ softly.assertThat(response.getCallbackDelaySeconds()).isEqualTo(0);
+ softly.assertThat(response.getResourceModel()).isNull();
+ softly.assertThat(response.getMessage()).isNull();
+ softly.assertThat(response.getErrorCode()).isNull();
+
+ ResourceModel result = response.getResourceModels().get(0);
+ softly.assertThat(result.getArn()).isEqualTo(TEST_ARN);
+ softly.assertThat(result.getWebAppId()).isEqualTo(TEST_WEB_APP_ID);
+
+ verify(client, atLeastOnce()).listWebApps(any(ListWebAppsRequest.class));
+ }
+}
diff --git a/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/ReadHandlerTest.java b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/ReadHandlerTest.java
new file mode 100644
index 0000000..241e8e8
--- /dev/null
+++ b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/ReadHandlerTest.java
@@ -0,0 +1,85 @@
+package software.amazon.transfer.webapp;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+
+import org.assertj.core.api.SoftAssertions;
+import org.assertj.core.api.junit.jupiter.InjectSoftAssertions;
+import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import software.amazon.awssdk.services.transfer.model.DescribeWebAppCustomizationRequest;
+import software.amazon.awssdk.services.transfer.model.DescribeWebAppRequest;
+import software.amazon.cloudformation.proxy.OperationStatus;
+import software.amazon.cloudformation.proxy.ProgressEvent;
+import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
+
+@ExtendWith(MockitoExtension.class)
+@ExtendWith(SoftAssertionsExtension.class)
+public class ReadHandlerTest extends AbstractTestBase {
+
+ @InjectSoftAssertions
+ private SoftAssertions softly;
+
+ private final ReadHandler handler = new ReadHandler();
+
+ private void assertSuccessfulResponse(
+ ProgressEvent response, ResourceHandlerRequest request) {
+ assertThat(response).isNotNull();
+ softly.assertThat(response.getStatus()).isEqualTo(OperationStatus.SUCCESS);
+ softly.assertThat(response.getCallbackDelaySeconds()).isEqualTo(0);
+ softly.assertThat(response.getResourceModel()).isEqualTo(request.getDesiredResourceState());
+ softly.assertThat(response.getResourceModels()).isNull();
+ softly.assertThat(response.getMessage()).isNull();
+ softly.assertThat(response.getErrorCode()).isNull();
+
+ verify(client, atLeastOnce()).describeWebApp(any(DescribeWebAppRequest.class));
+ }
+
+ @Test
+ public void handleRequest_SimpleSuccess() {
+ ResourceModel model = simpleWebAppModel();
+ model.setWebAppId(TEST_WEB_APP_ID);
+ model.setArn(TEST_ARN);
+ model.setAccessEndpoint(TEST_ACCESS_ENDPOINT);
+
+ ResourceHandlerRequest request =
+ requestBuilder().desiredResourceState(model).build();
+
+ doReturn(describeWebAppResponseFromModel(model)).when(client).describeWebApp(any(DescribeWebAppRequest.class));
+
+ ProgressEvent response =
+ handler.handleRequest(proxy, request, new CallbackContext(), proxyClient, logger);
+
+ assertSuccessfulResponse(response, request);
+ softly.assertThat(response.getResourceModel().getArn().equals(TEST_ARN));
+ }
+
+ @Test
+ public void handleRequest_LoadedSuccess() {
+ ResourceModel model = fullyLoadedWebAppModel();
+ model.setWebAppId(TEST_WEB_APP_ID);
+ model.setArn(TEST_ARN);
+
+ ResourceHandlerRequest request =
+ requestBuilder().desiredResourceState(model).build();
+
+ doReturn(describeWebAppResponseFromModel(model)).when(client).describeWebApp(any(DescribeWebAppRequest.class));
+
+ doReturn(describeWebAppCustomizationResponseFromModel(model))
+ .when(client)
+ .describeWebAppCustomization(any(DescribeWebAppCustomizationRequest.class));
+
+ ProgressEvent response =
+ handler.handleRequest(proxy, request, new CallbackContext(), proxyClient, logger);
+
+ assertSuccessfulResponse(response, request);
+ verify(client, atLeastOnce()).describeWebAppCustomization(any(DescribeWebAppCustomizationRequest.class));
+ softly.assertThat(response.getResourceModel().getArn().equals(TEST_ARN));
+ }
+}
diff --git a/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/UpdateHandlerTest.java b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/UpdateHandlerTest.java
new file mode 100644
index 0000000..6ab6440
--- /dev/null
+++ b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/UpdateHandlerTest.java
@@ -0,0 +1,324 @@
+package software.amazon.transfer.webapp;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.util.List;
+
+import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.stubbing.Stubber;
+
+import software.amazon.awssdk.awscore.exception.AwsErrorDetails;
+import software.amazon.awssdk.awscore.exception.AwsServiceException;
+import software.amazon.awssdk.services.transfer.model.DescribeWebAppCustomizationRequest;
+import software.amazon.awssdk.services.transfer.model.DescribeWebAppRequest;
+import software.amazon.awssdk.services.transfer.model.DescribeWebAppResponse;
+import software.amazon.awssdk.services.transfer.model.TagResourceRequest;
+import software.amazon.awssdk.services.transfer.model.UntagResourceRequest;
+import software.amazon.awssdk.services.transfer.model.UpdateWebAppCustomizationRequest;
+import software.amazon.awssdk.services.transfer.model.UpdateWebAppCustomizationResponse;
+import software.amazon.awssdk.services.transfer.model.UpdateWebAppRequest;
+import software.amazon.awssdk.services.transfer.model.UpdateWebAppResponse;
+import software.amazon.cloudformation.proxy.OperationStatus;
+import software.amazon.cloudformation.proxy.ProgressEvent;
+import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
+import software.amazon.transfer.webapp.translators.Translator;
+
+@ExtendWith(MockitoExtension.class)
+@ExtendWith(SoftAssertionsExtension.class)
+public class UpdateHandlerTest extends AbstractTestBase {
+
+ final UpdateHandler handler = new UpdateHandler();
+
+ @Test
+ public void handleRequest_SimpleSuccess() {
+ ResourceModel model = simpleWebAppModel();
+
+ final ResourceHandlerRequest request = requestBuilder()
+ .previousResourceState(model)
+ .desiredResourceState(model)
+ .build();
+
+ ProgressEvent response = updateWebAppAndAssertSuccess(request);
+ assertThat(response.getResourceModel()).isEqualTo(model);
+
+ verify(client, atLeastOnce()).updateWebApp(any(UpdateWebAppRequest.class));
+ }
+
+ @Test
+ public void handleRequest_NullIdentityProviderDetails() {
+ ResourceModel model = simpleWebAppModel();
+ ResourceModel newModel = simpleWebAppModel();
+ newModel.setIdentityProviderDetails(null);
+
+ final ResourceHandlerRequest request = requestBuilder()
+ .previousResourceState(model)
+ .desiredResourceState(newModel)
+ .build();
+
+ ProgressEvent response = updateWebAppAndAssertSuccess(request);
+ assertThat(response.getResourceModel().getIdentityProviderDetails())
+ .isEqualTo(model.getIdentityProviderDetails());
+
+ verify(client, atLeastOnce()).updateWebApp(any(UpdateWebAppRequest.class));
+ }
+
+ @Test
+ public void handleRequest_NullWebAppCustomization() {
+ ResourceModel model = fullyLoadedWebAppModel();
+ model.setWebAppId(TEST_WEB_APP_ID);
+ ResourceModel newModel = fullyLoadedWebAppModel();
+ newModel.setWebAppId(TEST_WEB_APP_ID);
+ newModel.setWebAppCustomization(null);
+
+ final ResourceHandlerRequest request = requestBuilder()
+ .previousResourceState(model)
+ .desiredResourceState(newModel)
+ .build();
+
+ ProgressEvent response = updateWebAppAndAssertSuccess(request);
+ assertThat(response.getResourceModel().getWebAppCustomization()).isEqualTo(model.getWebAppCustomization());
+
+ verify(client, atLeastOnce()).updateWebApp(any(UpdateWebAppRequest.class));
+ }
+
+ @Test
+ public void handleRequest_SimpleUpdate_Tagging_Failed() {
+ ResourceModel model = simpleWebAppModel();
+ ResourceModel newModel = simpleWebAppModel();
+ newModel.setTags(Translator.translateTagMapToTagList(EXTRA_MODEL_TAGS));
+
+ ResourceHandlerRequest request = requestBuilder()
+ .previousResourceState(model)
+ .desiredResourceState(newModel)
+ .desiredResourceTags(EXTRA_MODEL_TAGS)
+ .build();
+
+ AwsServiceException ex = AwsServiceException.builder()
+ .awsErrorDetails(
+ AwsErrorDetails.builder().errorCode("AccessDenied").build())
+ .build();
+ doThrow(ex).when(client).tagResource(any(TagResourceRequest.class));
+
+ updateWebAppAndAssertStatus(request, OperationStatus.FAILED);
+
+ verify(client, atLeastOnce()).updateWebApp(any(UpdateWebAppRequest.class));
+ verify(client, atLeastOnce()).tagResource(any(TagResourceRequest.class));
+
+ request = requestBuilder()
+ .previousResourceState(newModel)
+ .desiredResourceState(model)
+ .previousResourceTags(EXTRA_MODEL_TAGS)
+ .build();
+ doThrow(ex).when(client).untagResource(any(UntagResourceRequest.class));
+
+ updateWebAppAndAssertStatus(request, OperationStatus.FAILED);
+
+ verify(client, atLeastOnce()).updateWebApp(any(UpdateWebAppRequest.class));
+ verify(client, atLeastOnce()).untagResource(any(UntagResourceRequest.class));
+ }
+
+ @Test
+ public void handleRequest_VerifyAddingAndRemovingTags() {
+ Tag tag1 = Tag.builder().key("key1").value("value1").build();
+ Tag tag2 = Tag.builder().key("key2").value("value2").build();
+ Tag tag3 = Tag.builder().key("key3").value("value3").build();
+
+ ResourceModel currentModel = simpleWebAppModel();
+ ResourceModel desiredModel = simpleWebAppModel();
+
+ desiredModel.setTags(List.of(tag1, tag2, tag3));
+
+ ResourceHandlerRequest request = requestBuilder()
+ .previousResourceState(currentModel)
+ .desiredResourceState(desiredModel)
+ .build();
+
+ ProgressEvent response = updateWebAppAndAssertSuccess(request);
+
+ assertThat(response.getResourceModel()).isEqualTo(desiredModel);
+
+ currentModel.setTags(List.of(tag1, tag2, tag3));
+ desiredModel.setTags(List.of());
+
+ request = requestBuilder()
+ .previousResourceState(currentModel)
+ .desiredResourceState(desiredModel)
+ .build();
+
+ response = updateWebAppAndAssertSuccess(request);
+
+ currentModel.setTags(List.of(tag1, tag3));
+ desiredModel.setTags(List.of(tag1, tag2, tag3));
+
+ request = requestBuilder()
+ .previousResourceState(currentModel)
+ .desiredResourceState(desiredModel)
+ .build();
+
+ response = updateWebAppAndAssertSuccess(request);
+
+ currentModel.setTags(List.of(tag1, tag2, tag3));
+ desiredModel.setTags(List.of(tag1, tag3));
+
+ request = requestBuilder()
+ .previousResourceState(currentModel)
+ .desiredResourceState(desiredModel)
+ .build();
+
+ response = updateWebAppAndAssertSuccess(request);
+
+ assertThat(response.getResourceModel()).isEqualTo(desiredModel);
+ verify(client, times(4)).updateWebApp(any(UpdateWebAppRequest.class));
+ }
+
+ @Test
+ public void handleRequest_VerifyChangingWebAppUnits() {
+ ResourceModel currentModel = simpleWebAppModel();
+ ResourceModel desiredModel = simpleWebAppModel();
+
+ desiredModel.setWebAppUnits(WebAppUnits.builder().provisioned(3).build());
+
+ ResourceHandlerRequest request = requestBuilder()
+ .previousResourceState(currentModel)
+ .desiredResourceState(desiredModel)
+ .build();
+
+ ProgressEvent response = updateWebAppAndAssertSuccess(request);
+
+ assertThat(response.getResourceModel()).isEqualTo(desiredModel);
+
+ verify(client, atLeastOnce()).updateWebApp(any(UpdateWebAppRequest.class));
+ }
+
+ @Test
+ public void handleRequest_VerifyChangingWebAppCustomization() {
+ ResourceModel currentModel = simpleWebAppModel();
+ ResourceModel desiredModel = simpleWebAppModel();
+
+ desiredModel.setWebAppCustomization(WebAppCustomization.builder()
+ .title("new title")
+ .logoFile(loadTestFile("logo.jpeg"))
+ .faviconFile(null)
+ .build());
+
+ ResourceHandlerRequest request = requestBuilder()
+ .previousResourceState(currentModel)
+ .desiredResourceState(desiredModel)
+ .build();
+
+ ProgressEvent response = updateWebAppAndAssertSuccess(request);
+
+ assertThat(response.getResourceModel()).isEqualTo(desiredModel);
+ verify(client, atLeastOnce()).updateWebApp(any(UpdateWebAppRequest.class));
+ verify(client, atLeastOnce()).updateWebAppCustomization(any(UpdateWebAppCustomizationRequest.class));
+
+ desiredModel.setWebAppCustomization(WebAppCustomization.builder()
+ .title("new title")
+ .logoFile(null)
+ .faviconFile(loadTestFile("favicon.jpeg"))
+ .build());
+
+ request = requestBuilder()
+ .previousResourceState(currentModel)
+ .desiredResourceState(desiredModel)
+ .build();
+
+ response = updateWebAppAndAssertSuccess(request);
+
+ assertThat(response.getResourceModel()).isEqualTo(desiredModel);
+ verify(client, atLeastOnce()).updateWebApp(any(UpdateWebAppRequest.class));
+ verify(client, atLeastOnce()).updateWebAppCustomization(any(UpdateWebAppCustomizationRequest.class));
+ }
+
+ private ProgressEvent updateWebAppAndAssertSuccess(
+ ResourceHandlerRequest request) {
+ return updateWebAppAndAssertStatus(request, OperationStatus.SUCCESS);
+ }
+
+ private ProgressEvent updateWebAppAndAssertStatus(
+ ResourceHandlerRequest request, OperationStatus status) {
+ // Create a copy to avoid the update handler mutating the original.
+ request = request.toBuilder()
+ .previousResourceState(
+ request.getPreviousResourceState().toBuilder().build())
+ .desiredResourceState(
+ request.getDesiredResourceState().toBuilder().build())
+ .build();
+
+ ResourceModel currentModel = request.getPreviousResourceState();
+ ResourceModel desiredModel = request.getDesiredResourceState();
+
+ setupUpdateWebAppResponse(null);
+
+ if (status == OperationStatus.SUCCESS) {
+ DescribeWebAppResponse describeResponse;
+ if (desiredModel.getIdentityProviderDetails() == null) {
+ describeResponse = describeWebAppResponseFromModel(currentModel);
+ } else {
+ describeResponse = describeWebAppResponseFromModel(desiredModel);
+ }
+ doReturn(describeResponse).when(client).describeWebApp(any(DescribeWebAppRequest.class));
+ }
+
+ // Only setup customization response if the model has customization
+ if (desiredModel.getWebAppCustomization() != null) {
+ setupUpdateWebAppCustomizationResponse(null);
+
+ doReturn(describeWebAppCustomizationResponseFromModel(desiredModel))
+ .when(client)
+ .describeWebAppCustomization(any(DescribeWebAppCustomizationRequest.class));
+ } else if (currentModel.getWebAppCustomization() != null) {
+ setupUpdateWebAppCustomizationResponse(null);
+
+ doReturn(describeWebAppCustomizationResponseFromModel(currentModel))
+ .when(client)
+ .describeWebAppCustomization(any(DescribeWebAppCustomizationRequest.class));
+ }
+
+ final ProgressEvent response =
+ handler.handleRequest(proxy, request, new CallbackContext(), proxyClient, logger);
+
+ assertThat(response).isNotNull();
+ assertThat(response.getStatus()).isEqualTo(status);
+
+ return response;
+ }
+
+ private void setupUpdateWebAppResponse(Exception ex) {
+ UpdateWebAppResponse response =
+ UpdateWebAppResponse.builder().webAppId(TEST_WEB_APP_ID).build();
+
+ Stubber stubber;
+ if (ex != null) {
+ stubber = doThrow(ex).doReturn(response);
+ } else {
+ stubber = doReturn(response);
+ }
+
+ stubber.when(client).updateWebApp(any(UpdateWebAppRequest.class));
+ }
+
+ private void setupUpdateWebAppCustomizationResponse(Exception ex) {
+ UpdateWebAppCustomizationResponse response = UpdateWebAppCustomizationResponse.builder()
+ .webAppId(TEST_WEB_APP_ID)
+ .build();
+
+ Stubber stubber;
+ if (ex != null) {
+ stubber = doThrow(ex).doReturn(response);
+ } else {
+ stubber = doReturn(response);
+ }
+
+ stubber.when(client).updateWebAppCustomization(any(UpdateWebAppCustomizationRequest.class));
+ }
+}
diff --git a/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/translators/ExtraCoverageTest.java b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/translators/ExtraCoverageTest.java
new file mode 100644
index 0000000..dc7647a
--- /dev/null
+++ b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/translators/ExtraCoverageTest.java
@@ -0,0 +1,42 @@
+package software.amazon.transfer.webapp.translators;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.collect.ImmutableMap;
+
+import org.junit.jupiter.api.Test;
+
+import software.amazon.awssdk.services.transfer.model.Tag;
+import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
+import software.amazon.transfer.webapp.ResourceModel;
+
+public class ExtraCoverageTest {
+ @Test
+ public void nullCheckingCodeCoverage() {
+ assertThat(Translator.translateToSdkTags((Map) null)).isNull();
+ assertThat(Translator.translateFromSdkTags((List) null)).isNull();
+ assertThat(Translator.translateTagMapToTagList((Map) null))
+ .isNull();
+ assertThat(Translator.translateTagListToTagMap((List) null))
+ .isNull();
+ assertThat(Translator.nullIfEmptyList((List) null)).isNull();
+ assertThat(Translator.emptyListIfNull((List) null)).isEmpty();
+ assertThat(Translator.emptyStringIfNull((String) null)).isEmpty();
+
+ ResourceModel state = ResourceModel.builder().build();
+ ImmutableMap tags = ImmutableMap.of("a", "b");
+ ResourceHandlerRequest request = ResourceHandlerRequest.builder()
+ .previousResourceState(state)
+ .desiredResourceState(state)
+ .previousResourceTags(tags)
+ .desiredResourceTags(tags)
+ .previousSystemTags(tags)
+ .systemTags(tags)
+ .build();
+ assertThat(TagHelper.getNewDesiredTags(request)).isEqualTo(tags);
+ assertThat(TagHelper.getPreviouslyAttachedTags(request)).isEqualTo(tags);
+ }
+}
diff --git a/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/translators/WebAppArnTest.java b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/translators/WebAppArnTest.java
new file mode 100644
index 0000000..e7a3c40
--- /dev/null
+++ b/aws-transfer-webapp/src/test/java/software/amazon/transfer/webapp/translators/WebAppArnTest.java
@@ -0,0 +1,21 @@
+package software.amazon.transfer.webapp.translators;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class WebAppArnTest {
+
+ @Test
+ public void testFromString() {
+ String arn = "arn:aws:transfer:us-east-1:123456789012:webapp/webapp-123456789012";
+ WebAppArn webAppArn = WebAppArn.fromString(arn);
+ assertEquals(arn, webAppArn.getArn());
+ assertEquals("transfer", webAppArn.getVendor());
+ assertEquals("us-east-1", webAppArn.getRegion().getName());
+ assertEquals("123456789012", webAppArn.getAccountId());
+ assertEquals("webapp", webAppArn.getResourceType());
+ assertEquals("webapp-123456789012", webAppArn.getWebAppId());
+ assertEquals("webapp-123456789012", webAppArn.getResourceId());
+ }
+}
diff --git a/aws-transfer-webapp/src/test/resources/favicon.jpeg b/aws-transfer-webapp/src/test/resources/favicon.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..50f8cdb12f5fe0952fa5996b83c23fe8b79bfc2d
GIT binary patch
literal 745
zcmex=^(PF6}rMnOeST|r4lSw=>~TvNxu(8R<c1}I=;VrF4wW9Q)H;sz?%
zD!{d!pzFb!U9xX3zTPI5o8roG<0MW4oqZMDikqloVbuf*=gfJ(V&YTRE(2~
znmD<{#3dx9RMpfqG__1j&CD$#!>q*YRht(X$9CR+%khz|%`9e4XZbYl?U{)a
zdk;)1{>;_!StYCeH=of0-br!C&g?rf{mJjExpI-}A4Rtqow(%kP1t(zoYm&@*gW19
zc${BodNuZCR8icy)rnam9tRk?9`O9tQdC)T=eqg&ulWZ;)!$s6_Hyq&@3{Mo|8D{S
DfbCDYcFCtT37-M6&)5!Ty%Bm5ZGZOq{3)k;40F*!6wgQ=i
z9!;5HSI*9&1IYS+{RBMhvo5kc$`Hr|O{xO0;0sc?AXF#eR{>PZ7N-njMrGLH_TLE|hgx_BkPDd3Ooz8D2x!e})
z6kD0t8Evfy?ke1(1PeEvx7fdsAYT3H(J+P&Q`LfW1-eFuob)V^D|h1o59!h$s5M##
zibJ&pos9OU*r<>14`FH%tN|NjVDkjcEc@RK|Id-jTN1bIDF5DcywV0AiOD1|7`~Fd
Yspu$>SUyGu3jhEB07*qoM6N<$g18T!-2eap
literal 0
HcmV?d00001
diff --git a/aws-transfer-webapp/src/test/resources/logo.jpeg b/aws-transfer-webapp/src/test/resources/logo.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..50f8cdb12f5fe0952fa5996b83c23fe8b79bfc2d
GIT binary patch
literal 745
zcmex=^(PF6}rMnOeST|r4lSw=>~TvNxu(8R<c1}I=;VrF4wW9Q)H;sz?%
zD!{d!pzFb!U9xX3zTPI5o8roG<0MW4oqZMDikqloVbuf*=gfJ(V&YTRE(2~
znmD<{#3dx9RMpfqG__1j&CD$#!>q*YRht(X$9CR+%khz|%`9e4XZbYl?U{)a
zdk;)1{>;_!StYCeH=of0-br!C&g?rf{mJjExpI-}A4Rtqow(%kP1t(zoYm&@*gW19
zc${BodNuZCR8icy)rnam9tRk?9`O9tQdC)T=eqg&ulWZ;)!$s6_Hyq&@3{Mo|8D{S
DfbCDYcFCtT37-M6&)5!Ty%Bm5ZGZOq{3)k;40F*!6wgQ=i
z9!;5HSI*9&1IYS+{RBMhvo5kc$`Hr|O{xO0;0sc?AXF#eR{>PZ7N-njMrGLH_TLE|hgx_BkPDd3Ooz8D2x!e})
z6kD0t8Evfy?ke1(1PeEvx7fdsAYT3H(J+P&Q`LfW1-eFuob)V^D|h1o59!h$s5M##
zibJ&pos9OU*r<>14`FH%tN|NjVDkjcEc@RK|Id-jTN1bIDF5DcywV0AiOD1|7`~Fd
Yspu$>SUyGu3jhEB07*qoM6N<$g18T!-2eap
literal 0
HcmV?d00001
diff --git a/aws-transfer-webapp/template.yml b/aws-transfer-webapp/template.yml
new file mode 100644
index 0000000..b523cd0
--- /dev/null
+++ b/aws-transfer-webapp/template.yml
@@ -0,0 +1,24 @@
+AWSTemplateFormatVersion: "2010-09-09"
+Transform: AWS::Serverless-2016-10-31
+Description: AWS SAM template for the AWS::Transfer::WebApp resource type
+
+Globals:
+ Function:
+ Timeout: 180 # docker start-up times can be long for SAM CLI
+ MemorySize: 256
+
+Resources:
+ TypeFunction:
+ Type: AWS::Serverless::Function
+ Properties:
+ Handler: software.amazon.transfer.webapp.HandlerWrapper::handleRequest
+ Runtime: java17
+ CodeUri: ./target/aws-transfer-webapp-handler-1.0-SNAPSHOT.jar
+
+ TestEntrypoint:
+ Type: AWS::Serverless::Function
+ Properties:
+ Handler: software.amazon.transfer.webapp.HandlerWrapper::testEntrypoint
+ Runtime: java17
+ CodeUri: ./target/aws-transfer-webapp-handler-1.0-SNAPSHOT.jar
+
diff --git a/pom.xml b/pom.xml
index 13ad499..1baa6ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,7 @@
aws-transfer-profile
aws-transfer-server
aws-transfer-user
+ aws-transfer-webapp
aws-transfer-workflow