From 8c76da6962113f0750819b6e6f73451da0587aca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steve=20Houe=CC=88l?= Date: Tue, 11 Aug 2020 18:38:04 +0200 Subject: [PATCH 1/2] fix: Fixing security issues on package.json dependencies --- docs/package.json | 5 +++++ docs/yarn.lock | 41 +++++++++++++++-------------------------- 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/docs/package.json b/docs/package.json index c9209901b..773c54999 100644 --- a/docs/package.json +++ b/docs/package.json @@ -16,6 +16,11 @@ "react": "^16.13.1", "react-dom": "^16.13.1" }, + "resolutions": { + "gatsby/*/*/dot-prop": "^5.1.1", + "gatsby-theme-apollo-docs/*/*/*/*/bl": "^1.0.1", + "gatsby-theme-apollo-docs/*/*/*/*/semver": "^4.3.2" + }, "keywords": [], "license": "MIT-0", "repository": "https://github.com/awslabs/aws-lambda-powertools-java", diff --git a/docs/yarn.lock b/docs/yarn.lock index f7ca9af02..ac63a5e8f 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -4313,6 +4313,14 @@ bindings@^1.5.0: dependencies: file-uri-to-path "1.0.0" +bl@^1.0.1, bl@~0.8.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c" + integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA== + dependencies: + readable-stream "^2.3.5" + safe-buffer "^5.1.1" + bl@^4.0.0: version "4.0.2" resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz#52b71e9088515d0606d9dd9cc7aa48dc1f98e73a" @@ -4322,13 +4330,6 @@ bl@^4.0.0: inherits "^2.0.4" readable-stream "^3.4.0" -bl@~0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/bl/-/bl-0.8.2.tgz#c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e" - integrity sha1-yba8oI0bwuoA/Ir7Txpf0eHGbk4= - dependencies: - readable-stream "~1.0.26" - blob@0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683" @@ -6572,14 +6573,7 @@ dot-case@^2.1.0: dependencies: no-case "^2.2.0" -dot-prop@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" - integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ== - dependencies: - is-obj "^1.0.0" - -dot-prop@^5.2.0: +dot-prop@^4.1.0, dot-prop@^5.1.1, dot-prop@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb" integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A== @@ -9996,11 +9990,6 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== -is-obj@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" - integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= - is-obj@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" @@ -13902,7 +13891,7 @@ read@^1.0.7: dependencies: mute-stream "~0.0.4" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -14766,6 +14755,11 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== +semver@^4.3.2, semver@~2.3.1: + version "4.3.6" + resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" + integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto= + semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" @@ -14776,11 +14770,6 @@ semver@^7.3.2: resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== -semver@~2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-2.3.2.tgz#b9848f25d6cf36333073ec9ef8856d42f1233e52" - integrity sha1-uYSPJdbPNjMwc+ye+IVtQvEjPlI= - send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" From 4bb8eb195cef3feda4ea7afee3b55842f8012d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steve=20Houe=CC=88l?= Date: Fri, 14 Aug 2020 09:38:26 +0200 Subject: [PATCH 2/2] fix: moving groupId and package from software.aws.lambda to software.amazon.lambda --- README.md | 6 +++--- docs/content/index.mdx | 4 ++-- example/HelloWorldFunction/pom.xml | 4 ++-- .../src/main/java/helloworld/App.java | 12 ++++++------ .../src/main/java/helloworld/AppStream.java | 2 +- pom.xml | 2 +- .../internal/LambdaHandlerProcessor.java | 2 +- .../lambda/logging/PowerLogger.java | 2 +- .../lambda/logging/PowerToolsLogging.java | 2 +- .../logging/internal/DefaultLambdaFields.java | 2 +- .../logging/internal/LambdaLoggingAspect.java | 12 ++++++------ .../lambda/tracing/PowerToolTracing.java | 2 +- .../lambda/tracing/PowerTracer.java | 2 +- .../tracing/internal/LambdaTracingAspect.java | 16 ++++++++-------- .../lambda/handlers/PowerLogToolEnabled.java | 4 ++-- .../handlers/PowerLogToolEnabledForStream.java | 4 ++-- .../lambda/handlers/PowerToolDisabled.java | 2 +- .../handlers/PowerToolDisabledForStream.java | 2 +- .../handlers/PowerToolLogEventEnabled.java | 4 ++-- .../PowerToolLogEventEnabledForStream.java | 4 ++-- .../handlers/PowerTracerToolEnabled.java | 4 ++-- .../PowerTracerToolEnabledForStream.java | 4 ++-- ...acerToolEnabledForStreamWithNoMetaData.java | 4 ++-- .../PowerTracerToolEnabledWithException.java | 4 ++-- .../PowerTracerToolEnabledWithNoMetaData.java | 4 ++-- .../lambda/logging/PowerLoggerTest.java | 3 +-- .../internal/LambdaLoggingAspectTest.java | 16 ++++++++-------- .../lambda/tracing/PowerTracerTest.java | 4 ++-- .../internal/LambdaTracingAspectTest.java | 18 +++++++++--------- 29 files changed, 75 insertions(+), 76 deletions(-) rename src/main/java/software/{aws => amazon}/lambda/internal/LambdaHandlerProcessor.java (96%) rename src/main/java/software/{aws => amazon}/lambda/logging/PowerLogger.java (82%) rename src/main/java/software/{aws => amazon}/lambda/logging/PowerToolsLogging.java (88%) rename src/main/java/software/{aws => amazon}/lambda/logging/internal/DefaultLambdaFields.java (94%) rename src/main/java/software/{aws => amazon}/lambda/logging/internal/LambdaLoggingAspect.java (88%) rename src/main/java/software/{aws => amazon}/lambda/tracing/PowerToolTracing.java (90%) rename src/main/java/software/{aws => amazon}/lambda/tracing/PowerTracer.java (98%) rename src/main/java/software/{aws => amazon}/lambda/tracing/internal/LambdaTracingAspect.java (77%) rename src/test/java/software/{aws => amazon}/lambda/handlers/PowerLogToolEnabled.java (79%) rename src/test/java/software/{aws => amazon}/lambda/handlers/PowerLogToolEnabledForStream.java (80%) rename src/test/java/software/{aws => amazon}/lambda/handlers/PowerToolDisabled.java (88%) rename src/test/java/software/{aws => amazon}/lambda/handlers/PowerToolDisabledForStream.java (89%) rename src/test/java/software/{aws => amazon}/lambda/handlers/PowerToolLogEventEnabled.java (78%) rename src/test/java/software/{aws => amazon}/lambda/handlers/PowerToolLogEventEnabledForStream.java (87%) rename src/test/java/software/{aws => amazon}/lambda/handlers/PowerTracerToolEnabled.java (78%) rename src/test/java/software/{aws => amazon}/lambda/handlers/PowerTracerToolEnabledForStream.java (81%) rename src/test/java/software/{aws => amazon}/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java (82%) rename src/test/java/software/{aws => amazon}/lambda/handlers/PowerTracerToolEnabledWithException.java (80%) rename src/test/java/software/{aws => amazon}/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java (80%) rename src/test/java/software/{aws => amazon}/lambda/logging/PowerLoggerTest.java (86%) rename src/test/java/software/{aws => amazon}/lambda/logging/internal/LambdaLoggingAspectTest.java (91%) rename src/test/java/software/{aws => amazon}/lambda/tracing/PowerTracerTest.java (98%) rename src/test/java/software/{aws => amazon}/lambda/tracing/internal/LambdaTracingAspectTest.java (90%) diff --git a/README.md b/README.md index 042d61b10..737fab31a 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Powertools is available in Maven Central. You can use your favourite dependency ... - software.aws.lambda + software.amazon.lambda aws-lambda-powertools-java YOUR_REQUIRED_VERSION @@ -37,7 +37,7 @@ And configure the aspectj-maven-plugin to compile-time weave (CTW) the aws-lambd 1.8 - software.aws.lambda + software.amazon.lambda aws-lambda-powertools-java @@ -59,7 +59,7 @@ repositories { } dependencies { - powertools 'software.aws.lambda:aws-lambda-powertools-java:YOUR_REQUIRED_VERSION' + powertools 'software.amazon.lambda:aws-lambda-powertools-java:YOUR_REQUIRED_VERSION' } ``` diff --git a/docs/content/index.mdx b/docs/content/index.mdx index fb33801c5..8ee26a12e 100644 --- a/docs/content/index.mdx +++ b/docs/content/index.mdx @@ -14,7 +14,7 @@ Powertools is available in Maven Central. You can use your favourite dependency ... - software.aws.lambda + software.amazon.lambda aws-lambda-powertools-java YOUR_REQUIRED_VERSION @@ -28,7 +28,7 @@ repositories { } dependencies { - powertools 'software.aws.lambda:aws-lambda-powertools-java:YOUR_REQUIRED_VERSION' + powertools 'software.amazon.lambda:aws-lambda-powertools-java:YOUR_REQUIRED_VERSION' } ``` diff --git a/example/HelloWorldFunction/pom.xml b/example/HelloWorldFunction/pom.xml index 1bba403bc..e24058662 100644 --- a/example/HelloWorldFunction/pom.xml +++ b/example/HelloWorldFunction/pom.xml @@ -14,7 +14,7 @@ - software.aws.lambda + software.amazon.lambda aws-lambda-powertools-java 0.1.0-SNAPSHOT @@ -65,7 +65,7 @@ ${maven.compiler.target} - software.aws.lambda + software.amazon.lambda aws-lambda-powertools-java diff --git a/example/HelloWorldFunction/src/main/java/helloworld/App.java b/example/HelloWorldFunction/src/main/java/helloworld/App.java index c1b7d254d..4b37db6b3 100644 --- a/example/HelloWorldFunction/src/main/java/helloworld/App.java +++ b/example/HelloWorldFunction/src/main/java/helloworld/App.java @@ -16,13 +16,13 @@ import com.amazonaws.xray.entities.Entity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import software.aws.lambda.logging.PowerLogger; -import software.aws.lambda.logging.PowerToolsLogging; -import software.aws.lambda.tracing.PowerToolTracing; -import software.aws.lambda.tracing.PowerTracer; +import software.amazon.lambda.logging.PowerLogger; +import software.amazon.lambda.logging.PowerToolsLogging; +import software.amazon.lambda.tracing.PowerToolTracing; +import software.amazon.lambda.tracing.PowerTracer; -import static software.aws.lambda.tracing.PowerTracer.putMetadata; -import static software.aws.lambda.tracing.PowerTracer.withEntitySubsegment; +import static software.amazon.lambda.tracing.PowerTracer.putMetadata; +import static software.amazon.lambda.tracing.PowerTracer.withEntitySubsegment; /** * Handler for requests to Lambda function. diff --git a/example/HelloWorldFunction/src/main/java/helloworld/AppStream.java b/example/HelloWorldFunction/src/main/java/helloworld/AppStream.java index 74b1381dc..b752f0c05 100644 --- a/example/HelloWorldFunction/src/main/java/helloworld/AppStream.java +++ b/example/HelloWorldFunction/src/main/java/helloworld/AppStream.java @@ -8,7 +8,7 @@ import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestStreamHandler; import com.fasterxml.jackson.databind.ObjectMapper; -import software.aws.lambda.logging.PowerToolsLogging; +import software.amazon.lambda.logging.PowerToolsLogging; public class AppStream implements RequestStreamHandler { private static final ObjectMapper mapper = new ObjectMapper(); diff --git a/pom.xml b/pom.xml index 89527a19d..848b5fd1f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - software.aws.lambda + software.amazon.lambda aws-lambda-powertools-java 0.1.0-SNAPSHOT jar diff --git a/src/main/java/software/aws/lambda/internal/LambdaHandlerProcessor.java b/src/main/java/software/amazon/lambda/internal/LambdaHandlerProcessor.java similarity index 96% rename from src/main/java/software/aws/lambda/internal/LambdaHandlerProcessor.java rename to src/main/java/software/amazon/lambda/internal/LambdaHandlerProcessor.java index 3e223fb21..cc3c12b89 100644 --- a/src/main/java/software/aws/lambda/internal/LambdaHandlerProcessor.java +++ b/src/main/java/software/amazon/lambda/internal/LambdaHandlerProcessor.java @@ -1,4 +1,4 @@ -package software.aws.lambda.internal; +package software.amazon.lambda.internal; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/main/java/software/aws/lambda/logging/PowerLogger.java b/src/main/java/software/amazon/lambda/logging/PowerLogger.java similarity index 82% rename from src/main/java/software/aws/lambda/logging/PowerLogger.java rename to src/main/java/software/amazon/lambda/logging/PowerLogger.java index 21e69c851..5bb7365b2 100644 --- a/src/main/java/software/aws/lambda/logging/PowerLogger.java +++ b/src/main/java/software/amazon/lambda/logging/PowerLogger.java @@ -1,4 +1,4 @@ -package software.aws.lambda.logging; +package software.amazon.lambda.logging; import org.apache.logging.log4j.ThreadContext; diff --git a/src/main/java/software/aws/lambda/logging/PowerToolsLogging.java b/src/main/java/software/amazon/lambda/logging/PowerToolsLogging.java similarity index 88% rename from src/main/java/software/aws/lambda/logging/PowerToolsLogging.java rename to src/main/java/software/amazon/lambda/logging/PowerToolsLogging.java index 4256efc55..98ade6924 100644 --- a/src/main/java/software/aws/lambda/logging/PowerToolsLogging.java +++ b/src/main/java/software/amazon/lambda/logging/PowerToolsLogging.java @@ -1,4 +1,4 @@ -package software.aws.lambda.logging; +package software.amazon.lambda.logging; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/software/aws/lambda/logging/internal/DefaultLambdaFields.java b/src/main/java/software/amazon/lambda/logging/internal/DefaultLambdaFields.java similarity index 94% rename from src/main/java/software/aws/lambda/logging/internal/DefaultLambdaFields.java rename to src/main/java/software/amazon/lambda/logging/internal/DefaultLambdaFields.java index ee2a504d7..9e2b04574 100644 --- a/src/main/java/software/aws/lambda/logging/internal/DefaultLambdaFields.java +++ b/src/main/java/software/amazon/lambda/logging/internal/DefaultLambdaFields.java @@ -1,4 +1,4 @@ -package software.aws.lambda.logging.internal; +package software.amazon.lambda.logging.internal; import com.amazonaws.services.lambda.runtime.Context; diff --git a/src/main/java/software/aws/lambda/logging/internal/LambdaLoggingAspect.java b/src/main/java/software/amazon/lambda/logging/internal/LambdaLoggingAspect.java similarity index 88% rename from src/main/java/software/aws/lambda/logging/internal/LambdaLoggingAspect.java rename to src/main/java/software/amazon/lambda/logging/internal/LambdaLoggingAspect.java index f065ca4fd..5e7b74fdf 100644 --- a/src/main/java/software/aws/lambda/logging/internal/LambdaLoggingAspect.java +++ b/src/main/java/software/amazon/lambda/logging/internal/LambdaLoggingAspect.java @@ -1,4 +1,4 @@ -package software.aws.lambda.logging.internal; +package software.amazon.lambda.logging.internal; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -19,14 +19,14 @@ import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; -import software.aws.lambda.logging.PowerToolsLogging; +import software.amazon.lambda.logging.PowerToolsLogging; import static java.util.Optional.empty; import static java.util.Optional.of; -import static software.aws.lambda.internal.LambdaHandlerProcessor.IS_COLD_START; -import static software.aws.lambda.internal.LambdaHandlerProcessor.isHandlerMethod; -import static software.aws.lambda.internal.LambdaHandlerProcessor.placedOnRequestHandler; -import static software.aws.lambda.internal.LambdaHandlerProcessor.placedOnStreamHandler; +import static software.amazon.lambda.internal.LambdaHandlerProcessor.IS_COLD_START; +import static software.amazon.lambda.internal.LambdaHandlerProcessor.isHandlerMethod; +import static software.amazon.lambda.internal.LambdaHandlerProcessor.placedOnRequestHandler; +import static software.amazon.lambda.internal.LambdaHandlerProcessor.placedOnStreamHandler; @Aspect public final class LambdaLoggingAspect { diff --git a/src/main/java/software/aws/lambda/tracing/PowerToolTracing.java b/src/main/java/software/amazon/lambda/tracing/PowerToolTracing.java similarity index 90% rename from src/main/java/software/aws/lambda/tracing/PowerToolTracing.java rename to src/main/java/software/amazon/lambda/tracing/PowerToolTracing.java index 48a2d4439..93f66fc63 100644 --- a/src/main/java/software/aws/lambda/tracing/PowerToolTracing.java +++ b/src/main/java/software/amazon/lambda/tracing/PowerToolTracing.java @@ -1,4 +1,4 @@ -package software.aws.lambda.tracing; +package software.amazon.lambda.tracing; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/software/aws/lambda/tracing/PowerTracer.java b/src/main/java/software/amazon/lambda/tracing/PowerTracer.java similarity index 98% rename from src/main/java/software/aws/lambda/tracing/PowerTracer.java rename to src/main/java/software/amazon/lambda/tracing/PowerTracer.java index 969e7c544..ba5ace41a 100644 --- a/src/main/java/software/aws/lambda/tracing/PowerTracer.java +++ b/src/main/java/software/amazon/lambda/tracing/PowerTracer.java @@ -1,4 +1,4 @@ -package software.aws.lambda.tracing; +package software.amazon.lambda.tracing; import java.util.function.Consumer; diff --git a/src/main/java/software/aws/lambda/tracing/internal/LambdaTracingAspect.java b/src/main/java/software/amazon/lambda/tracing/internal/LambdaTracingAspect.java similarity index 77% rename from src/main/java/software/aws/lambda/tracing/internal/LambdaTracingAspect.java rename to src/main/java/software/amazon/lambda/tracing/internal/LambdaTracingAspect.java index eb598fcf6..ba7348f13 100644 --- a/src/main/java/software/aws/lambda/tracing/internal/LambdaTracingAspect.java +++ b/src/main/java/software/amazon/lambda/tracing/internal/LambdaTracingAspect.java @@ -1,4 +1,4 @@ -package software.aws.lambda.tracing.internal; +package software.amazon.lambda.tracing.internal; import com.amazonaws.xray.AWSXRay; import com.amazonaws.xray.entities.Subsegment; @@ -7,13 +7,13 @@ import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; -import software.aws.lambda.tracing.PowerToolTracing; +import software.amazon.lambda.tracing.PowerToolTracing; +import software.amazon.lambda.tracing.PowerTracer; -import static software.aws.lambda.internal.LambdaHandlerProcessor.IS_COLD_START; -import static software.aws.lambda.internal.LambdaHandlerProcessor.isHandlerMethod; -import static software.aws.lambda.internal.LambdaHandlerProcessor.placedOnRequestHandler; -import static software.aws.lambda.internal.LambdaHandlerProcessor.placedOnStreamHandler; -import static software.aws.lambda.tracing.PowerTracer.SERVICE_NAME; +import static software.amazon.lambda.internal.LambdaHandlerProcessor.IS_COLD_START; +import static software.amazon.lambda.internal.LambdaHandlerProcessor.isHandlerMethod; +import static software.amazon.lambda.internal.LambdaHandlerProcessor.placedOnRequestHandler; +import static software.amazon.lambda.internal.LambdaHandlerProcessor.placedOnStreamHandler; @Aspect public final class LambdaTracingAspect { @@ -59,7 +59,7 @@ public Object around(ProceedingJoinPoint pjp, } private String namespace(PowerToolTracing powerToolsTracing) { - return powerToolsTracing.namespace().isEmpty() ? SERVICE_NAME : powerToolsTracing.namespace(); + return powerToolsTracing.namespace().isEmpty() ? PowerTracer.SERVICE_NAME : powerToolsTracing.namespace(); } private boolean placedOnHandlerMethod(ProceedingJoinPoint pjp) { diff --git a/src/test/java/software/aws/lambda/handlers/PowerLogToolEnabled.java b/src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabled.java similarity index 79% rename from src/test/java/software/aws/lambda/handlers/PowerLogToolEnabled.java rename to src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabled.java index 23d0dbe9b..3c21ae3fd 100644 --- a/src/test/java/software/aws/lambda/handlers/PowerLogToolEnabled.java +++ b/src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabled.java @@ -1,8 +1,8 @@ -package software.aws.lambda.handlers; +package software.amazon.lambda.handlers; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestHandler; -import software.aws.lambda.logging.PowerToolsLogging; +import software.amazon.lambda.logging.PowerToolsLogging; public class PowerLogToolEnabled implements RequestHandler { diff --git a/src/test/java/software/aws/lambda/handlers/PowerLogToolEnabledForStream.java b/src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabledForStream.java similarity index 80% rename from src/test/java/software/aws/lambda/handlers/PowerLogToolEnabledForStream.java rename to src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabledForStream.java index 1163617ba..d2a1b90e7 100644 --- a/src/test/java/software/aws/lambda/handlers/PowerLogToolEnabledForStream.java +++ b/src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabledForStream.java @@ -1,11 +1,11 @@ -package software.aws.lambda.handlers; +package software.amazon.lambda.handlers; import java.io.InputStream; import java.io.OutputStream; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestStreamHandler; -import software.aws.lambda.logging.PowerToolsLogging; +import software.amazon.lambda.logging.PowerToolsLogging; public class PowerLogToolEnabledForStream implements RequestStreamHandler { diff --git a/src/test/java/software/aws/lambda/handlers/PowerToolDisabled.java b/src/test/java/software/amazon/lambda/handlers/PowerToolDisabled.java similarity index 88% rename from src/test/java/software/aws/lambda/handlers/PowerToolDisabled.java rename to src/test/java/software/amazon/lambda/handlers/PowerToolDisabled.java index 9d6c35510..43bc31cf2 100644 --- a/src/test/java/software/aws/lambda/handlers/PowerToolDisabled.java +++ b/src/test/java/software/amazon/lambda/handlers/PowerToolDisabled.java @@ -1,4 +1,4 @@ -package software.aws.lambda.handlers; +package software.amazon.lambda.handlers; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestHandler; diff --git a/src/test/java/software/aws/lambda/handlers/PowerToolDisabledForStream.java b/src/test/java/software/amazon/lambda/handlers/PowerToolDisabledForStream.java similarity index 89% rename from src/test/java/software/aws/lambda/handlers/PowerToolDisabledForStream.java rename to src/test/java/software/amazon/lambda/handlers/PowerToolDisabledForStream.java index 49836c91b..63ea3ddf4 100644 --- a/src/test/java/software/aws/lambda/handlers/PowerToolDisabledForStream.java +++ b/src/test/java/software/amazon/lambda/handlers/PowerToolDisabledForStream.java @@ -1,4 +1,4 @@ -package software.aws.lambda.handlers; +package software.amazon.lambda.handlers; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/test/java/software/aws/lambda/handlers/PowerToolLogEventEnabled.java b/src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabled.java similarity index 78% rename from src/test/java/software/aws/lambda/handlers/PowerToolLogEventEnabled.java rename to src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabled.java index 8bc7ee084..66d84bedc 100644 --- a/src/test/java/software/aws/lambda/handlers/PowerToolLogEventEnabled.java +++ b/src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabled.java @@ -1,8 +1,8 @@ -package software.aws.lambda.handlers; +package software.amazon.lambda.handlers; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestHandler; -import software.aws.lambda.logging.PowerToolsLogging; +import software.amazon.lambda.logging.PowerToolsLogging; public class PowerToolLogEventEnabled implements RequestHandler { diff --git a/src/test/java/software/aws/lambda/handlers/PowerToolLogEventEnabledForStream.java b/src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabledForStream.java similarity index 87% rename from src/test/java/software/aws/lambda/handlers/PowerToolLogEventEnabledForStream.java rename to src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabledForStream.java index 28bfc542e..352f3e7b5 100644 --- a/src/test/java/software/aws/lambda/handlers/PowerToolLogEventEnabledForStream.java +++ b/src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabledForStream.java @@ -1,4 +1,4 @@ -package software.aws.lambda.handlers; +package software.amazon.lambda.handlers; import java.io.IOException; import java.io.InputStream; @@ -8,7 +8,7 @@ import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestStreamHandler; import com.fasterxml.jackson.databind.ObjectMapper; -import software.aws.lambda.logging.PowerToolsLogging; +import software.amazon.lambda.logging.PowerToolsLogging; public class PowerToolLogEventEnabledForStream implements RequestStreamHandler { diff --git a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabled.java b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabled.java similarity index 78% rename from src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabled.java rename to src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabled.java index 6df2ee6b9..f2fc0a0b3 100644 --- a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabled.java +++ b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabled.java @@ -1,8 +1,8 @@ -package software.aws.lambda.handlers; +package software.amazon.lambda.handlers; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestHandler; -import software.aws.lambda.tracing.PowerToolTracing; +import software.amazon.lambda.tracing.PowerToolTracing; public class PowerTracerToolEnabled implements RequestHandler { diff --git a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledForStream.java b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStream.java similarity index 81% rename from src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledForStream.java rename to src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStream.java index ee13f9946..8c446b30e 100644 --- a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledForStream.java +++ b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStream.java @@ -1,11 +1,11 @@ -package software.aws.lambda.handlers; +package software.amazon.lambda.handlers; import java.io.InputStream; import java.io.OutputStream; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestStreamHandler; -import software.aws.lambda.tracing.PowerToolTracing; +import software.amazon.lambda.tracing.PowerToolTracing; public class PowerTracerToolEnabledForStream implements RequestStreamHandler { diff --git a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java similarity index 82% rename from src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java rename to src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java index 8788121bb..f04cdfdf5 100644 --- a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java +++ b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java @@ -1,11 +1,11 @@ -package software.aws.lambda.handlers; +package software.amazon.lambda.handlers; import java.io.InputStream; import java.io.OutputStream; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestStreamHandler; -import software.aws.lambda.tracing.PowerToolTracing; +import software.amazon.lambda.tracing.PowerToolTracing; public class PowerTracerToolEnabledForStreamWithNoMetaData implements RequestStreamHandler { diff --git a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledWithException.java b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithException.java similarity index 80% rename from src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledWithException.java rename to src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithException.java index 542a5069c..24940a031 100644 --- a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledWithException.java +++ b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithException.java @@ -1,8 +1,8 @@ -package software.aws.lambda.handlers; +package software.amazon.lambda.handlers; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestHandler; -import software.aws.lambda.tracing.PowerToolTracing; +import software.amazon.lambda.tracing.PowerToolTracing; public class PowerTracerToolEnabledWithException implements RequestHandler { diff --git a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java similarity index 80% rename from src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java rename to src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java index 1c3584922..2c41073f4 100644 --- a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java +++ b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java @@ -1,8 +1,8 @@ -package software.aws.lambda.handlers; +package software.amazon.lambda.handlers; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestHandler; -import software.aws.lambda.tracing.PowerToolTracing; +import software.amazon.lambda.tracing.PowerToolTracing; public class PowerTracerToolEnabledWithNoMetaData implements RequestHandler { diff --git a/src/test/java/software/aws/lambda/logging/PowerLoggerTest.java b/src/test/java/software/amazon/lambda/logging/PowerLoggerTest.java similarity index 86% rename from src/test/java/software/aws/lambda/logging/PowerLoggerTest.java rename to src/test/java/software/amazon/lambda/logging/PowerLoggerTest.java index 0e56c8255..fcec6f6ac 100644 --- a/src/test/java/software/aws/lambda/logging/PowerLoggerTest.java +++ b/src/test/java/software/amazon/lambda/logging/PowerLoggerTest.java @@ -1,9 +1,8 @@ -package software.aws.lambda.logging; +package software.amazon.lambda.logging; import org.apache.logging.log4j.ThreadContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import software.aws.lambda.logging.PowerLogger; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/software/aws/lambda/logging/internal/LambdaLoggingAspectTest.java b/src/test/java/software/amazon/lambda/logging/internal/LambdaLoggingAspectTest.java similarity index 91% rename from src/test/java/software/aws/lambda/logging/internal/LambdaLoggingAspectTest.java rename to src/test/java/software/amazon/lambda/logging/internal/LambdaLoggingAspectTest.java index 7dc7eba66..a1451ad6e 100644 --- a/src/test/java/software/aws/lambda/logging/internal/LambdaLoggingAspectTest.java +++ b/src/test/java/software/amazon/lambda/logging/internal/LambdaLoggingAspectTest.java @@ -1,4 +1,4 @@ -package software.aws.lambda.logging.internal; +package software.amazon.lambda.logging.internal; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -15,13 +15,13 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import software.aws.lambda.handlers.PowerToolDisabled; -import software.aws.lambda.handlers.PowerToolDisabledForStream; -import software.aws.lambda.handlers.PowerLogToolEnabled; -import software.aws.lambda.handlers.PowerLogToolEnabledForStream; -import software.aws.lambda.handlers.PowerToolLogEventEnabled; -import software.aws.lambda.handlers.PowerToolLogEventEnabledForStream; -import software.aws.lambda.internal.LambdaHandlerProcessor; +import software.amazon.lambda.internal.LambdaHandlerProcessor; +import software.amazon.lambda.handlers.PowerToolDisabled; +import software.amazon.lambda.handlers.PowerToolDisabledForStream; +import software.amazon.lambda.handlers.PowerLogToolEnabled; +import software.amazon.lambda.handlers.PowerLogToolEnabledForStream; +import software.amazon.lambda.handlers.PowerToolLogEventEnabled; +import software.amazon.lambda.handlers.PowerToolLogEventEnabledForStream; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; diff --git a/src/test/java/software/aws/lambda/tracing/PowerTracerTest.java b/src/test/java/software/amazon/lambda/tracing/PowerTracerTest.java similarity index 98% rename from src/test/java/software/aws/lambda/tracing/PowerTracerTest.java rename to src/test/java/software/amazon/lambda/tracing/PowerTracerTest.java index bce270e64..deada5db2 100644 --- a/src/test/java/software/aws/lambda/tracing/PowerTracerTest.java +++ b/src/test/java/software/amazon/lambda/tracing/PowerTracerTest.java @@ -1,4 +1,4 @@ -package software.aws.lambda.tracing; +package software.amazon.lambda.tracing; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.xray.AWSXRay; @@ -10,7 +10,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static software.aws.lambda.tracing.PowerTracer.withEntitySubsegment; +import static software.amazon.lambda.tracing.PowerTracer.withEntitySubsegment; class PowerTracerTest { diff --git a/src/test/java/software/aws/lambda/tracing/internal/LambdaTracingAspectTest.java b/src/test/java/software/amazon/lambda/tracing/internal/LambdaTracingAspectTest.java similarity index 90% rename from src/test/java/software/aws/lambda/tracing/internal/LambdaTracingAspectTest.java rename to src/test/java/software/amazon/lambda/tracing/internal/LambdaTracingAspectTest.java index 44a3623e3..ecf5c592d 100644 --- a/src/test/java/software/aws/lambda/tracing/internal/LambdaTracingAspectTest.java +++ b/src/test/java/software/amazon/lambda/tracing/internal/LambdaTracingAspectTest.java @@ -1,4 +1,4 @@ -package software.aws.lambda.tracing.internal; +package software.amazon.lambda.tracing.internal; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -12,14 +12,14 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import software.aws.lambda.handlers.PowerToolDisabled; -import software.aws.lambda.handlers.PowerToolDisabledForStream; -import software.aws.lambda.handlers.PowerTracerToolEnabled; -import software.aws.lambda.handlers.PowerTracerToolEnabledForStream; -import software.aws.lambda.handlers.PowerTracerToolEnabledForStreamWithNoMetaData; -import software.aws.lambda.handlers.PowerTracerToolEnabledWithException; -import software.aws.lambda.handlers.PowerTracerToolEnabledWithNoMetaData; -import software.aws.lambda.internal.LambdaHandlerProcessor; +import software.amazon.lambda.handlers.PowerToolDisabled; +import software.amazon.lambda.handlers.PowerToolDisabledForStream; +import software.amazon.lambda.handlers.PowerTracerToolEnabledForStreamWithNoMetaData; +import software.amazon.lambda.handlers.PowerTracerToolEnabledWithException; +import software.amazon.lambda.handlers.PowerTracerToolEnabled; +import software.amazon.lambda.handlers.PowerTracerToolEnabledForStream; +import software.amazon.lambda.handlers.PowerTracerToolEnabledWithNoMetaData; +import software.amazon.lambda.internal.LambdaHandlerProcessor; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable;