smithy-call

aws/aws-sigv4/src/main/java/software/amazon/smithy/java/aws/client/auth/scheme/sigv4/SigV4Signer.java

@@ -159,7 +159,7 @@ private Map<String, List<String>> createSignedHeaders(
         var headers = copyHeaders(httpHeaders);
 
         // AWS4 requires a number of headers to be set before signing including 'Host' and 'X-Amz-Date'
-        var hostHeader = uriUsingNonStandardPort(uri) ? uri.getHost() + ':' + uri.getPort() : uri.getHost();
+        var hostHeader = uriUsingStandardPort(uri) ? uri.getHost() + ':' + uri.getPort() : uri.getHost();
         headers.put("host", List.of(hostHeader));
 
         var sb = signingResources.sb;
@@ -249,12 +249,11 @@ private static void appendTwoDigits(int value, StringBuilder sb) {
         sb.append(value);
     }
 
-    private static boolean uriUsingNonStandardPort(URI uri) {
+    private static boolean uriUsingStandardPort(URI uri) {
         return switch (uri.getPort()) {
-            case -1 -> false;
             case 80 -> uri.getScheme().equals("http");
             case 443 -> uri.getScheme().equals("https");
-            default -> throw new IllegalStateException("Unexpected value for URI scheme: " + uri.getScheme());
+            default -> false;
         };
     }
 

cli/README.md

@@ -0,0 +1,17 @@
+## smithy-call
+
+This module contains the base-version of smithy-call: a CLI that uses ahead-of-time compilation and the dynamic client to make adhoc calls to services.
+
+
+The functionality provided by this CLI includes:
+1. Execute operations listed in a service model
+2. List operations listed in a service model
+3. SigV4 authentication
+4. Multi-protocol support
+
+### Example Call
+1. Build the native binary for smithy-call: `./gradlew :cli:nativeCompile`
+2. Start-up Cafe service from the end-to-end example: `./gradlew :examples:end-to-end:run`
+3. Check the available operations: `./cli/build/native/nativeCompile/smithy-call com.example#CoffeeShop --list-operations -m /Users/fluu/workplace/smithy-java-cli/examples/end-to-end/model`
+4. Send a test call to our Cafe service: `./cli/build/native/nativeCompile/smithy-call com.example#CoffeeShop GetMenu -m /Users/fluu/workplace/smithy-java-cli/examples/end-to-end/model --url http://localhost:8888`
+

cli/build.gradle.kts

@@ -0,0 +1,102 @@
+plugins {
+    `java-library`
+    application
+    alias(libs.plugins.graalvm.native)
+}
+
+dependencies {
+    implementation(libs.picocli)
+    annotationProcessor(libs.picocli.codegen)
+
+    implementation(libs.smithy.aws.traits)
+    implementation(libs.smithy.waiters)
+
+    // Client dependencies
+    implementation(project(":aws:client:aws-client-restjson"))
+    implementation(project(":aws:client:aws-client-awsjson"))
+    implementation(project(":aws:client:aws-client-restxml"))
+    implementation(project(":client:client-rpcv2-cbor"))
+
+    implementation(project(":client:dynamic-client"))
+    implementation(project(":codecs:json-codec"))
+    implementation(project(":client:client-http"))
+    implementation(project(":aws:client:aws-client-core"))
+    implementation(project(":aws:aws-sigv4"))
+
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.junit.jupiter.api)
+    testImplementation(libs.junit.jupiter.engine)
+    testImplementation(libs.junit.jupiter.params)
+}
+
+tasks.register<Copy>("copySmithyAwsTraits") {
+    from(zipTree(configurations.runtimeClasspath.get().filter { it.name.startsWith("smithy-aws-traits-") }.single())) {
+        include("**/*.smithy")
+        eachFile {
+            relativePath = RelativePath(true, name)
+        }
+    }
+    into(layout.buildDirectory.dir("smithy-aws-traits"))
+
+    includeEmptyDirs = false
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
+tasks.named("processResources") {
+    dependsOn("copySmithyAwsTraits")
+}
+
+sourceSets {
+    main {
+        resources {
+            srcDir(layout.buildDirectory.dir("smithy-aws-traits"))
+        }
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+    testLogging {
+        events("passed", "skipped", "failed")
+    }
+}
+
+application {
+    mainClass = "software.amazon.smithy.java.cli.SmithyCallRunner"
+}
+
+graalvmNative {
+    binaries.named("main") {
+        // Set up correct java JVM to use.
+        javaLauncher.set(
+            javaToolchains.launcherFor {
+                // Use oracle GraalVM JDK for build
+                languageVersion.set(JavaLanguageVersion.of(23))
+                vendor.set(JvmVendorSpec.matching("Oracle Corporation"))
+            },
+        )
+
+        // Ensure resources are detected
+        resources.autodetect()
+
+        buildArgs.addAll(listOf(
+            "-H:ResourceConfigurationFiles=${projectDir}/src/resource-config.json",
+            "--enable-url-protocols=http,https",
+        ))
+
+        // Debug info
+        verbose.set(true)
+
+        // Image configuration
+        imageName.set("smithy-call")
+        mainClass.set(application.mainClass)
+
+        // Determines if image is a shared library [note: defaults to true if java-library plugin is applied]
+        sharedLibrary.set(false)
+    }
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}

cli/src/main/java/software/amazon/smithy/java/cli/ProtocolType.java

@@ -0,0 +1,8 @@
+package software.amazon.smithy.java.cli;
+
+public enum ProtocolType {
+    AWS_JSON,
+    RPC_V2_CBOR,
+    REST_JSON,
+    REST_XML
+}