wip: attepting to untangle AI

Author: ianbotsf

.gitignore

@@ -14,12 +14,11 @@ __pycache__/
 local.properties
 
 # ignore generated files
-services/*/generated-src
+**/generated-src
 services/*/build.gradle.kts
 services/*/API.md
 services/*/OVERVIEW.md
 .kotest/
 .kotlin/
 *.klib
-tests/codegen/smoke-tests/services/*/generated-src
 tests/codegen/smoke-tests/services/*/build.gradle.kts

aws-custom-sdk-build-plugin/build.gradle.kts

@@ -21,18 +21,17 @@ repositories {
 dependencies {
     // Gradle API - use explicit Kotlin version matching parent project
     implementation(kotlin("gradle-plugin", version = "2.1.0"))
-    
-    // Kotlin reflection for constants registry
-    implementation(kotlin("reflect", version = "2.1.0"))
-    
+
     // JSON processing for Smithy build configuration
     implementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")
 
     // Smithy dependencies for model processing - use versions matching parent project
     implementation("software.amazon.smithy:smithy-model:1.60.2")
     implementation("software.amazon.smithy:smithy-aws-traits:1.60.2")
     implementation("software.amazon.smithy:smithy-protocol-traits:1.60.2")
-    
+
+    implementation(libs.plugins.aws.kotlin.repo.tools.smithybuild)
+
     // Smithy CLI for real build execution
     implementation("software.amazon.smithy:smithy-cli:1.60.2")
 
@@ -45,6 +44,14 @@ dependencies {
     testImplementation("io.mockk:mockk:1.13.13")
 }
 
+kotlin {
+    sourceSets {
+        main {
+            kotlin.srcDir("generated-src/main/kotlin")
+        }
+    }
+}
+
 gradlePlugin {
     plugins {
         create("awsCustomSdkBuild") {

aws-custom-sdk-build-plugin/src/main/kotlin/aws/sdk/kotlin/gradle/customsdk/AwsCustomSdkBuildExtension.kt

@@ -6,203 +6,43 @@
 package aws.sdk.kotlin.gradle.customsdk
 
 import org.gradle.api.Project
+import org.gradle.api.artifacts.Dependency
 import org.gradle.api.provider.Property
+import org.gradle.api.provider.Provider
 
 /**
  * Extension for configuring the AWS Custom SDK Build plugin.
  * 
  * Provides a type-safe DSL for specifying which AWS services and operations
  * to include in the custom SDK build.
  */
-abstract class AwsCustomSdkBuildExtension(private val project: Project) {
-    
-    /**
-     * AWS region for the generated clients (optional, defaults to us-east-1)
-     */
-    abstract val region: Property<String>
-    
+abstract class AwsCustomSdkBuildExtension(internal val project: Project) {
     /**
-     * Output directory for generated clients (optional, defaults to build/generated/aws-custom-sdk)
+     * Output directory for generated clients. Defaults to `${project.layout.buildDirectory}/generated-src/aws-sdk`.
      */
     abstract val outputDirectory: Property<String>
 
     /**
-     * Package name for generated clients (optional, defaults to aws.sdk.kotlin.custom)
-     */
-    abstract val packageName: Property<String>
-    
-    /**
-     * Enable strict validation of operations against generated constants (default: true)
+     * Package name for generated clients. Defaults to `aws.sdk.kotlin.services`.
      */
-    abstract val strictValidation: Property<Boolean>
-    
+    abstract val packageNamePrefix: Property<String>
+
     /**
      * Set of selected services with their operations
      */
-    private val selectedServices = mutableMapOf<String, MutableSet<String>>()
-    
+    internal val selectedServices = mutableMapOf<String, Set<String>>()
+
     init {
         // Set default values
-        region.convention("us-east-1")
-        outputDirectory.convention("${project.buildDir}/generated/aws-custom-sdk")
-        packageName.convention("aws.sdk.kotlin.custom")
-        strictValidation.convention(true)
+        outputDirectory.convention("${project.layout.buildDirectory}/generated-src/aws-sdk")
+        packageNamePrefix.convention("aws.sdk.kotlin.services")
     }
-    
-    /**
-     * Configure a service with selected operations using type-safe constants
-     * 
-     * Example with type-safe constants:
-     * ```
-     * service("lambda") {
-     *     operations(
-     *         LambdaOperations.CreateFunction,
-     *         LambdaOperations.InvokeFunction,
-     *         LambdaOperations.DeleteFunction
-     *     )
-     * }
-     * ```
-     * 
-     * Example with string literals (backward compatibility):
-     * ```
-     * service("s3") {
-     *     operations("GetObject", "PutObject")
-     * }
-     * ```
-     */
-    fun service(serviceName: String, configure: ServiceConfiguration.() -> Unit) {
-        val serviceConfig = ServiceConfiguration(serviceName, project)
-        serviceConfig.configure()
-        
-        val operations = serviceConfig.getOperations()
-        
-        // Validate operations if strict validation is enabled
-        if (strictValidation.get()) {
-            val validationResult = ConstantsRegistry.validateOperations(serviceName, operations)
-            if (!validationResult.isValid) {
-                project.logger.warn("AWS Custom SDK: ${validationResult.message}")
-                if (validationResult.invalidOperations.isNotEmpty()) {
-                    project.logger.warn("Available operations for $serviceName: ${ConstantsRegistry.getServiceOperations(serviceName).sorted().joinToString(", ")}")
-                }
-            }
-        }
-        
-        selectedServices[serviceName] = operations.toMutableSet()
-    }
-    
-    /**
-     * Configure multiple services using a DSL block
-     * 
-     * Example:
-     * ```
-     * services {
-     *     lambda {
-     *         operations(LambdaOperations.CreateFunction, LambdaOperations.InvokeFunction)
-     *     }
-     *     s3 {
-     *         operations(S3Operations.GetObject, S3Operations.PutObject)
-     *     }
-     * }
-     * ```
-     */
-    fun services(configure: ServicesConfiguration.() -> Unit) {
-        val servicesConfig = ServicesConfiguration(this)
-        servicesConfig.configure()
-    }
-    
-    /**
-     * Get all selected services and their operations
-     */
-    fun getSelectedServices(): Map<String, Set<String>> = selectedServices.toMap()
-    
-    /**
-     * Get validation summary for all configured services
-     */
-    fun getValidationSummary(): Map<String, ConstantsRegistry.ValidationResult> {
-        return selectedServices.mapValues { (serviceName, operations) ->
-            ConstantsRegistry.validateOperations(serviceName, operations)
-        }
-    }
-    
-    /**
-     * Configuration block for multiple services
-     */
-    class ServicesConfiguration(private val extension: AwsCustomSdkBuildExtension) {
-        
-        fun lambda(configure: ServiceConfiguration.() -> Unit) {
-            extension.service("lambda", configure)
-        }
-        
-        fun s3(configure: ServiceConfiguration.() -> Unit) {
-            extension.service("s3", configure)
-        }
-        
-        fun dynamodb(configure: ServiceConfiguration.() -> Unit) {
-            extension.service("dynamodb", configure)
-        }
-        
-        fun apigateway(configure: ServiceConfiguration.() -> Unit) {
-            extension.service("apigateway", configure)
-        }
-        
-        /**
-         * Generic service configuration for services not explicitly defined
-         */
-        fun service(serviceName: String, configure: ServiceConfiguration.() -> Unit) {
-            extension.service(serviceName, configure)
-        }
-    }
-    
-    /**
-     * Configuration block for a specific service
-     */
-    class ServiceConfiguration(private val serviceName: String, private val project: Project) {
-        private val operations = mutableSetOf<String>()
-        
-        /**
-         * Add operations using type-safe constants or string literals
-         * 
-         * Examples:
-         * ```
-         * operations(LambdaOperations.CreateFunction, LambdaOperations.InvokeFunction)
-         * operations("CreateFunction", "InvokeFunction")
-         * ```
-         */
-        fun operations(vararg operationConstants: String) {
-            operations.addAll(operationConstants)
-        }
-        
-        /**
-         * Add operations using a collection of constants
-         */
-        fun operations(operationConstants: Collection<String>) {
-            operations.addAll(operationConstants)
-        }
-        
-        /**
-         * Add all available operations for this service
-         */
-        fun allOperations() {
-            val availableOps = ConstantsRegistry.getServiceOperations(serviceName)
-            if (availableOps.isNotEmpty()) {
-                operations.addAll(availableOps)
-                project.logger.info("Added all ${availableOps.size} operations for $serviceName service")
-            } else {
-                project.logger.warn("No operation constants available for $serviceName service")
-            }
-        }
-        
-        /**
-         * Add operations matching a pattern (regex)
-         */
-        fun operationsMatching(pattern: String) {
-            val regex = Regex(pattern)
-            val availableOps = ConstantsRegistry.getServiceOperations(serviceName)
-            val matchingOps = availableOps.filter { regex.matches(it) }
-            operations.addAll(matchingOps)
-            project.logger.info("Added ${matchingOps.size} operations matching '$pattern' for $serviceName service")
+
+    internal fun service(serviceName: String, operationNames: Set<String>): Provider<Dependency> {
+        check(serviceName !in selectedServices) {
+            "Service $serviceName configured multiple times. All service configuration should be in a single DSL block."
         }
-        
-        internal fun getOperations(): Set<String> = operations.toSet()
+
+        selectedServices[serviceName] = operationNames
     }
 }

aws-custom-sdk-build-plugin/src/main/kotlin/aws/sdk/kotlin/gradle/customsdk/AwsCustomSdkBuildPlugin.kt

@@ -16,19 +16,14 @@ import org.gradle.api.Project
  * operation constants for configuration.
  */
 class AwsCustomSdkBuildPlugin : Plugin<Project> {
-    
     companion object {
         const val EXTENSION_NAME = "awsCustomSdk"
         const val GENERATE_CLIENTS_TASK_NAME = "generateAwsCustomClients"
     }
 
     override fun apply(project: Project) {
         // Create the extension for DSL configuration
-        val extension = project.extensions.create(
-            EXTENSION_NAME,
-            AwsCustomSdkBuildExtension::class.java,
-            project
-        )
+        val extension = project.extensions.create(EXTENSION_NAME, AwsCustomSdkBuildExtension::class.java, project)
 
         // Register the main task for generating custom clients
         project.tasks.register(GENERATE_CLIENTS_TASK_NAME, GenerateCustomClientsTask::class.java)