rename querydefinitions -> querydefinition (#57)

aws-cloudformation · Mar 17, 2021 · a0363cb · a0363cb
1 parent a776f36
commit a0363cb
Show file tree

Hide file tree

Showing 26 changed files with 44 additions and 46 deletions.
diff --git a/aws-logs-querydefinitions/.gitignore → aws-logs-querydefinition/.gitignore b/aws-logs-querydefinitions/.gitignore → aws-logs-querydefinition/.gitignore
diff --git a/aws-logs-querydefinitions/.rpdk-config → aws-logs-querydefinition/.rpdk-config b/aws-logs-querydefinitions/.rpdk-config → aws-logs-querydefinition/.rpdk-config
@@ -1,10 +1,10 @@
 {
     "artifact_type": "RESOURCE",
-    "typeName": "AWS::Logs::QueryDefinitions",
+    "typeName": "AWS::Logs::QueryDefinition",
     "language": "java",
     "runtime": "java8",
-    "entrypoint": "software.amazon.logs.querydefinitions.HandlerWrapper::handleRequest",
-    "testEntrypoint": "software.amazon.logs.querydefinitions.HandlerWrapper::testEntrypoint",
+    "entrypoint": "software.amazon.logs.querydefinition.HandlerWrapper::handleRequest",
+    "testEntrypoint": "software.amazon.logs.querydefinition.HandlerWrapper::testEntrypoint",
     "settings": {
         "version": false,
         "subparser_name": null,
@@ -16,10 +16,10 @@
             "software",
             "amazon",
             "logs",
-            "querydefinitions"
+            "querydefinition"
         ],
         "codegen_template_path": "default",
         "protocolVersion": "2.0.0"
     },
-    "executableEntrypoint": "software.amazon.logs.querydefinitions.HandlerWrapperExecutable"
+    "executableEntrypoint": "software.amazon.logs.querydefinition.HandlerWrapperExecutable"
 }
diff --git a/aws-logs-querydefinitions/README.md → aws-logs-querydefinition/README.md b/aws-logs-querydefinitions/README.md → aws-logs-querydefinition/README.md
@@ -1,6 +1,6 @@
-# AWS::Logs::QueryDefinitions
+# AWS::Logs::QueryDefinition
 
-This repository is for the QueryDefinitions CloudFormation resource type.
+This repository is for the QueryDefinition CloudFormation resource type.
 
 *To get started run:*
 ```

diff --git a/...efinitions/aws-logs-querydefinitions.json → ...ydefinition/aws-logs-querydefinition.json b/...efinitions/aws-logs-querydefinitions.json → ...ydefinition/aws-logs-querydefinition.json
@@ -1,6 +1,6 @@
 {
-  "typeName": "AWS::Logs::QueryDefinitions",
-  "description": "The resource schema for AWSLogs QueryDefinitions",
+  "typeName": "AWS::Logs::QueryDefinition",
+  "description": "The resource schema for AWSLogs QueryDefinition",
   "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-logs.git",
   "definitions": {
     "LogGroup": {

diff --git a/aws-logs-querydefinitions/docs/README.md → aws-logs-querydefinition/docs/README.md b/aws-logs-querydefinitions/docs/README.md → aws-logs-querydefinition/docs/README.md
@@ -1,6 +1,6 @@
-# AWS::Logs::QueryDefinitions
+# AWS::Logs::QueryDefinition
 
-The resource schema for AWSLogs QueryDefinitions
+The resource schema for AWSLogs QueryDefinition
 
 ## Syntax
 
@@ -10,7 +10,7 @@ To declare this entity in your AWS CloudFormation template, use the following sy
 
 <pre>
 {
-    "Type" : "AWS::Logs::QueryDefinitions",
+    "Type" : "AWS::Logs::QueryDefinition",
     "Properties" : {
         "<a href="#name" title="Name">Name</a>" : <i>String</i>,
         "<a href="#querystring" title="QueryString">QueryString</a>" : <i>String</i>,
@@ -22,7 +22,7 @@ To declare this entity in your AWS CloudFormation template, use the following sy
 ### YAML
 
 <pre>
-Type: AWS::Logs::QueryDefinitions
+Type: AWS::Logs::QueryDefinition
 Properties:
     <a href="#name" title="Name">Name</a>: <i>String</i>
     <a href="#querystring" title="QueryString">QueryString</a>: <i>String</i>

diff --git a/aws-logs-querydefinitions/lombok.config → aws-logs-querydefinition/lombok.config b/aws-logs-querydefinitions/lombok.config → aws-logs-querydefinition/lombok.config
diff --git a/aws-logs-querydefinitions/pom.xml → aws-logs-querydefinition/pom.xml b/aws-logs-querydefinitions/pom.xml → aws-logs-querydefinition/pom.xml
@@ -5,9 +5,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>software.amazon.logs.querydefinitions</groupId>
-    <artifactId>aws-logs-querydefinitions-handler</artifactId>
-    <name>aws-logs-querydefinitions-handler</name>
+    <groupId>software.amazon.logs.querydefinition</groupId>
+    <artifactId>aws-logs-querydefinition-handler</artifactId>
+    <name>aws-logs-querydefinition-handler</name>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
@@ -219,7 +219,7 @@
             <resource>
                 <directory>${project.basedir}</directory>
                 <includes>
-                    <include>aws-logs-querydefinitions.json</include>
+                    <include>aws-logs-querydefinition.json</include>
                 </includes>
             </resource>
         </resources>

diff --git a/aws-logs-querydefinitions/resource-role.yaml → aws-logs-querydefinition/resource-role.yaml b/aws-logs-querydefinitions/resource-role.yaml → aws-logs-querydefinition/resource-role.yaml
diff --git a/...ogs/querydefinitions/CallbackContext.java → ...logs/querydefinition/CallbackContext.java b/...ogs/querydefinitions/CallbackContext.java → ...logs/querydefinition/CallbackContext.java
@@ -1,4 +1,4 @@
-package software.amazon.logs.querydefinitions;
+package software.amazon.logs.querydefinition;
 
 import software.amazon.cloudformation.proxy.StdCallbackContext;
 

diff --git a/.../logs/querydefinitions/ClientBuilder.java → ...n/logs/querydefinition/ClientBuilder.java b/.../logs/querydefinitions/ClientBuilder.java → ...n/logs/querydefinition/ClientBuilder.java
@@ -1,4 +1,4 @@
-package software.amazon.logs.querydefinitions;
+package software.amazon.logs.querydefinition;
 
 import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;
 import software.amazon.cloudformation.LambdaWrapper;

diff --git a/...ogs-querydefinition/src/main/java/software/amazon/logs/querydefinition/Configuration.java b/...ogs-querydefinition/src/main/java/software/amazon/logs/querydefinition/Configuration.java
@@ -0,0 +1,8 @@
+package software.amazon.logs.querydefinition;
+
+class Configuration extends BaseConfiguration {
+
+    public Configuration() {
+        super("aws-logs-querydefinition.json");
+    }
+}
diff --git a/.../logs/querydefinitions/CreateHandler.java → ...n/logs/querydefinition/CreateHandler.java b/.../logs/querydefinitions/CreateHandler.java → ...n/logs/querydefinition/CreateHandler.java
@@ -1,4 +1,4 @@
-package software.amazon.logs.querydefinitions;
+package software.amazon.logs.querydefinition;
 
 import software.amazon.awssdk.services.cloudwatchlogs.model.InvalidParameterException;
 import software.amazon.awssdk.services.cloudwatchlogs.model.PutQueryDefinitionResponse;

diff --git a/.../logs/querydefinitions/DeleteHandler.java → ...n/logs/querydefinition/DeleteHandler.java b/.../logs/querydefinitions/DeleteHandler.java → ...n/logs/querydefinition/DeleteHandler.java
@@ -1,4 +1,4 @@
-package software.amazon.logs.querydefinitions;
+package software.amazon.logs.querydefinition;
 
 import software.amazon.awssdk.services.cloudwatchlogs.model.DeleteQueryDefinitionResponse;
 import software.amazon.awssdk.services.cloudwatchlogs.model.InvalidParameterException;
@@ -10,7 +10,6 @@
 import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy;
 import software.amazon.cloudformation.proxy.Logger;
 import software.amazon.cloudformation.proxy.ProgressEvent;
-import software.amazon.cloudformation.proxy.OperationStatus;
 import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
 
 public class DeleteHandler extends BaseHandler<CallbackContext> {

diff --git a/...on/logs/querydefinitions/ListHandler.java → ...zon/logs/querydefinition/ListHandler.java b/...on/logs/querydefinitions/ListHandler.java → ...zon/logs/querydefinition/ListHandler.java
@@ -1,4 +1,4 @@
-package software.amazon.logs.querydefinitions;
+package software.amazon.logs.querydefinition;
 
 import software.amazon.awssdk.services.cloudwatchlogs.model.DescribeQueryDefinitionsResponse;
 import software.amazon.awssdk.services.cloudwatchlogs.model.InvalidParameterException;

diff --git a/...on/logs/querydefinitions/ReadHandler.java → ...zon/logs/querydefinition/ReadHandler.java b/...on/logs/querydefinitions/ReadHandler.java → ...zon/logs/querydefinition/ReadHandler.java
@@ -1,6 +1,5 @@
-package software.amazon.logs.querydefinitions;
+package software.amazon.logs.querydefinition;
 
-import software.amazon.awssdk.services.cloudwatchlogs.model.DescribeQueryDefinitionsRequest;
 import software.amazon.awssdk.services.cloudwatchlogs.model.DescribeQueryDefinitionsResponse;
 import software.amazon.awssdk.services.cloudwatchlogs.model.InvalidParameterException;
 import software.amazon.awssdk.services.cloudwatchlogs.model.QueryDefinition;

diff --git a/...zon/logs/querydefinitions/Translator.java → ...azon/logs/querydefinition/Translator.java b/...zon/logs/querydefinitions/Translator.java → ...azon/logs/querydefinition/Translator.java
@@ -1,4 +1,4 @@
-package software.amazon.logs.querydefinitions;
+package software.amazon.logs.querydefinition;
 
 import software.amazon.awssdk.services.cloudwatchlogs.model.DeleteQueryDefinitionRequest;
 import software.amazon.awssdk.services.cloudwatchlogs.model.DescribeQueryDefinitionsRequest;

diff --git a/.../logs/querydefinitions/UpdateHandler.java → ...n/logs/querydefinition/UpdateHandler.java b/.../logs/querydefinitions/UpdateHandler.java → ...n/logs/querydefinition/UpdateHandler.java
@@ -1,4 +1,4 @@
-package software.amazon.logs.querydefinitions;
+package software.amazon.logs.querydefinition;
 
 import software.amazon.awssdk.services.cloudwatchlogs.model.InvalidParameterException;
 import software.amazon.awssdk.services.cloudwatchlogs.model.ResourceNotFoundException;

diff --git a/...querydefinitions/src/resources/log4j2.xml → ...-querydefinition/src/resources/log4j2.xml b/...querydefinitions/src/resources/log4j2.xml → ...-querydefinition/src/resources/log4j2.xml
diff --git a/...azon/logs/querydefinitions/BaseTests.java → ...mazon/logs/querydefinition/BaseTests.java b/...azon/logs/querydefinitions/BaseTests.java → ...mazon/logs/querydefinition/BaseTests.java
@@ -1,4 +1,4 @@
-package software.amazon.logs.querydefinitions;
+package software.amazon.logs.querydefinition;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/...s/querydefinitions/CreateHandlerTest.java → ...gs/querydefinition/CreateHandlerTest.java b/...s/querydefinitions/CreateHandlerTest.java → ...gs/querydefinition/CreateHandlerTest.java
@@ -1,4 +1,4 @@
-package software.amazon.logs.querydefinitions;
+package software.amazon.logs.querydefinition;
 
 import com.google.common.collect.ImmutableList;
 import org.mockito.ArgumentMatchers;

diff --git a/...s/querydefinitions/DeleteHandlerTest.java → ...gs/querydefinition/DeleteHandlerTest.java b/...s/querydefinitions/DeleteHandlerTest.java → ...gs/querydefinition/DeleteHandlerTest.java
@@ -1,4 +1,4 @@
-package software.amazon.logs.querydefinitions;
+package software.amazon.logs.querydefinition;
 
 import org.mockito.ArgumentMatchers;
 import software.amazon.awssdk.services.cloudwatchlogs.model.DeleteQueryDefinitionResponse;

diff --git a/...ogs/querydefinitions/ListHandlerTest.java → ...logs/querydefinition/ListHandlerTest.java b/...ogs/querydefinitions/ListHandlerTest.java → ...logs/querydefinition/ListHandlerTest.java
@@ -1,4 +1,4 @@
-package software.amazon.logs.querydefinitions;
+package software.amazon.logs.querydefinition;
 
 import com.google.common.collect.ImmutableList;
 import org.mockito.ArgumentMatchers;

diff --git a/...ogs/querydefinitions/ReadHandlerTest.java → ...logs/querydefinition/ReadHandlerTest.java b/...ogs/querydefinitions/ReadHandlerTest.java → ...logs/querydefinition/ReadHandlerTest.java
@@ -1,4 +1,4 @@
-package software.amazon.logs.querydefinitions;
+package software.amazon.logs.querydefinition;
 
 import com.google.common.collect.ImmutableList;
 import org.mockito.ArgumentMatchers;

diff --git a/...s/querydefinitions/UpdateHandlerTest.java → ...gs/querydefinition/UpdateHandlerTest.java b/...s/querydefinitions/UpdateHandlerTest.java → ...gs/querydefinition/UpdateHandlerTest.java
@@ -1,4 +1,4 @@
-package software.amazon.logs.querydefinitions;
+package software.amazon.logs.querydefinition;
 
 import org.mockito.ArgumentMatchers;
 import software.amazon.awssdk.services.cloudwatchlogs.model.PutQueryDefinitionResponse;

diff --git a/aws-logs-querydefinitions/template.yml → aws-logs-querydefinition/template.yml b/aws-logs-querydefinitions/template.yml → aws-logs-querydefinition/template.yml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: "2010-09-09"
 Transform: AWS::Serverless-2016-10-31
-Description: AWS SAM template for the AWS::Logs::QueryDefinitions resource type
+Description: AWS SAM template for the AWS::Logs::QueryDefinition resource type
 
 Globals:
   Function:
@@ -11,13 +11,13 @@ Resources:
   TypeFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: software.amazon.logs.querydefinitions.HandlerWrapper::handleRequest
+      Handler: software.amazon.logs.querydefinition.HandlerWrapper::handleRequest
       Runtime: java8
-      CodeUri: ./target/aws-logs-querydefinitions-handler-1.0-SNAPSHOT.jar
+      CodeUri: ./target/aws-logs-querydefinition-handler-1.0-SNAPSHOT.jar
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: software.amazon.logs.querydefinitions.HandlerWrapper::testEntrypoint
+      Handler: software.amazon.logs.querydefinition.HandlerWrapper::testEntrypoint
       Runtime: java8
-      CodeUri: ./target/aws-logs-querydefinitions-handler-1.0-SNAPSHOT.jar
+      CodeUri: ./target/aws-logs-querydefinition-handler-1.0-SNAPSHOT.jar
diff --git a/...s-querydefinitions/src/main/java/software/amazon/logs/querydefinitions/Configuration.java b/...s-querydefinitions/src/main/java/software/amazon/logs/querydefinitions/Configuration.java