Fixing contract tests for AWS::CodeArtifact::Domain Repository after … (#44)

* Fixing contract tests for AWS::CodeArtifact::Domain Repository after schema updates.

* Silly logs and need to run pre-commit.

Author: jonjara

aws-codeartifact-domain/inputs/inputs_1_create.json

@@ -0,0 +1,20 @@
+{
+  "PermissionsPolicyDocument": {
+    "Version": "2012-10-17",
+    "Statement": [
+      {
+        "Effect": "Allow",
+        "Principal": "*",
+        "Action": "codeartifact:*",
+        "Resource": "*"
+      }
+    ]
+  },
+  "Upstreams": null,
+  "ExternalConnections": [
+    "public:npmjs"
+  ],
+  "DomainOwner": null,
+  "DomainName": "create-contract-domain",
+  "Description": "test description"
+}

aws-codeartifact-domain/inputs/inputs_1_invalid.json

@@ -0,0 +1,15 @@
+{
+  "DomainName": "create-contract-domain",
+  "PermissionsPolicyDocument": {
+    "Version": "2012-10-17",
+    "Statement": [
+      {
+        "Effect": "Allow",
+        "Principal": "*",
+        "Action": "codeartifact:*",
+        "Resource": "*"
+      }
+    ]
+  },
+  "Name": "create-contract-domain"
+}

aws-codeartifact-domain/inputs/inputs_1_update.json

@@ -0,0 +1,18 @@
+{
+  "PermissionsPolicyDocument": {
+    "Version": "2012-10-17",
+    "Statement": [
+      {
+        "Effect": "Allow",
+        "Principal": "*",
+        "Action": "codeartifact:*",
+        "Resource": "*"
+      }
+    ]
+  },
+  "Upstreams": null,
+  "ExternalConnections": null,
+  "DomainOwner": null,
+  "DomainName": "create-contract-domain",
+  "Description": "test description"
+}

aws-codeartifact-domain/overrides.json

@@ -68,7 +68,7 @@ private CreateDomainResponse createDomainSdkCall(
     }
 
     private boolean hasReadOnlyProperties(final ResourceModel model) {
-        return model.getDomainOwner() != null;
+        return model.getDomainOwner() != null || model.getName() != null || model.getOwner() != null;
     }
 
     private boolean isStabilized(

aws-codeartifact-domain/src/main/java/software/amazon/codeartifact/domain/CreateHandler.java

@@ -87,6 +87,8 @@ static ResourceModel translateFromReadResponse(final DescribeDomainResponse awsR
     return ResourceModel.builder()
         .encryptionKey(domain.encryptionKey())
         .name(domain.name())
+        .domainName(domain.name())
+        .domainOwner(domain.owner())
         .owner(domain.owner())
         .arn(domain.arn())
         .build();

aws-codeartifact-domain/src/main/java/software/amazon/codeartifact/domain/Translator.java

@@ -29,7 +29,7 @@ protected ProgressEvent<ResourceModel, CallbackContext> handleRequest(
             !Objects.equals(previousResourceState.getEncryptionKey(), desiredResourceState.getEncryptionKey())
         ) {
             // cannot update domainName/EncryptionKey because it's CreateOnly
-            throw new CfnNotUpdatableException(ResourceModel.TYPE_NAME, desiredResourceState.getArn());
+            throw new CfnNotUpdatableException(ResourceModel.TYPE_NAME, desiredResourceState.getDomainName());
         }
 
         return ProgressEvent.progress(request.getDesiredResourceState(), callbackContext)

aws-codeartifact-domain/src/main/java/software/amazon/codeartifact/domain/UpdateHandler.java

@@ -70,6 +70,8 @@ public class CreateHandlerTest extends AbstractTestBase {
         .build();
 
     private final ResourceModel desiredOutputModel = ResourceModel.builder()
+        .domainName(DOMAIN_NAME)
+        .domainOwner(DOMAIN_OWNER)
         .name(DOMAIN_NAME)
         .owner(DOMAIN_OWNER)
         .arn(DOMAIN_ARN)

aws-codeartifact-domain/src/test/java/software/amazon/codeartifact/domain/CreateHandlerTest.java

@@ -95,8 +95,10 @@ public void handleRequest_simpleSuccess() {
         final ProgressEvent<ResourceModel, CallbackContext> response = handler.handleRequest(proxy, request, new CallbackContext(), proxyClient, logger);
 
         final ResourceModel desiredOutputModel = ResourceModel.builder()
-            .name(DOMAIN_NAME)
+            .domainName(DOMAIN_NAME)
+            .domainOwner(DOMAIN_OWNER)
             .owner(DOMAIN_OWNER)
+            .name(DOMAIN_NAME)
             .arn(DOMAIN_ARN)
             .encryptionKey(ENCRYPTION_KEY_ARN)
             .build();
@@ -146,6 +148,8 @@ public void handleRequest_withOnlyArn() {
         final ProgressEvent<ResourceModel, CallbackContext> response = handler.handleRequest(proxy, request, new CallbackContext(), proxyClient, logger);
 
         final ResourceModel desiredOutputModel = ResourceModel.builder()
+            .domainName(DOMAIN_NAME)
+            .domainOwner(DOMAIN_OWNER)
             .name(DOMAIN_NAME)
             .owner(DOMAIN_OWNER)
             .arn(DOMAIN_ARN)

aws-codeartifact-domain/src/test/java/software/amazon/codeartifact/domain/ReadHandlerTest.java

@@ -59,6 +59,8 @@ public class UpdateHandlerTest extends AbstractTestBase {
         .build();
 
     private final ResourceModel desiredOutputModel = ResourceModel.builder()
+        .domainName(DOMAIN_NAME)
+        .domainOwner(DOMAIN_OWNER)
         .owner(DOMAIN_OWNER)
         .name(DOMAIN_NAME)
         .arn(DOMAIN_ARN)