diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c9b821d..3a16e0bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,9 +57,9 @@ jobs: - uses: extractions/setup-just@v1 with: just-version: '1.14.0' # just for sanity - - uses: pulumi/actions@v4 + - uses: pulumi/actions@v5 with: - pulumi-version: '3.116.1' + pulumi-version: '3.134.0' - uses: coursier/cache-action@v6.4.3 - uses: VirtusLab/scala-cli-setup@v1.1.0 with: diff --git a/.scalafmt.conf b/.scalafmt.conf index e56579f3..453e02ba 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,7 +1,7 @@ version = 3.5.2 runner.dialect = scala3 project.excludePaths = [ - "glob:**/src/main/scala/besom/rpc/**.scala" + "glob:**/besom-rpc/src/main/scala/**.scala" ] project.git = true align = most @@ -11,4 +11,4 @@ align.tokens = [{code = "=>", owner = "Case"}, "<-", "%", "%%", "="] indent.defnSite = 2 maxColumn = 140 -rewrite.scala3.insertEndMarkerMinLines = 40 \ No newline at end of file +rewrite.scala3.insertEndMarkerMinLines = 40 diff --git a/Justfile b/Justfile index a4d83c61..276a7112 100644 --- a/Justfile +++ b/Justfile @@ -3,7 +3,7 @@ besom-version := `cat version.txt` besom-cfg-version := `cat besom-cfg/version.txt` is-snapshot := if "{{besom-version}}" =~ '.*-SNAPSHOT' { "true" } else { "false" } -no-bloop-ci := if env_var_or_default('CI', "") == "true" { "--server=false" } else { "" } +no-bloop := if env_var_or_default('BESOM_BUILD_NO_BLOOP', "") == "true" { "--server=false" } else { "" } language-plugin-output-dir := justfile_directory() + "/.out/language-plugin" codegen-output-dir := justfile_directory() + "/.out/codegen" @@ -26,7 +26,8 @@ scala-cli-coverage-options-zio := if coverage == "true" { "-O -coverage-out:" + scala-cli-test-options-zio := scala-cli-coverage-options-zio publish-maven-auth-options := "--user env:OSSRH_USERNAME --password env:OSSRH_PASSWORD --gpg-key $PGP_KEY_ID --gpg-option --pinentry-mode --gpg-option loopback --gpg-option --passphrase --gpg-option $PGP_PASSWORD" -ci-opts := if env_var_or_default('CI', "") == "true" { "--repository=sonatype:snapshots" } else { "" } +ci-opts := "" +# if env_var_or_default('CI', "") == "true" { "--repository=sonatype:snapshots" } else { "" } # This list of available targets default: @@ -43,20 +44,20 @@ build-packages-for-templates-and-examples: grep -hr "0.3-SNAPSHOT" examples/**/*.scala templates/**/*.scala | sed -n 's/.*besom-\([^:]*:[^"]*\).*-core.0.3-SNAPSHOT.*/\1/p' | sort -u | tr '\n' ' ' | xargs -I {} just cli packages local {} # Cleans everything -clean-all: clean-json clean-sdk clean-auto clean-out clean-compiler-plugin clean-codegen clean-scripts clean-test-integration clean-cfg clean-test-templates clean-test-examples clean-test-markdown +clean-all: clean-json clean-rpc clean-sdk clean-auto clean-out clean-compiler-plugin clean-codegen clean-scripts clean-test-integration clean-cfg clean-test-templates clean-test-examples clean-test-markdown # Compiles everything -compile-all: compile-json compile-sdk compile-auto compile-codegen compile-scripts compile-compiler-plugin build-language-plugin +compile-all: compile-json compile-rpc compile-sdk compile-auto compile-codegen compile-scripts compile-compiler-plugin build-language-plugin # Tests everything test-all: test-json test-sdk test-auto test-codegen test-scripts test-integration build-packages-for-templates-and-examples test-templates test-examples test-markdown # Publishes everything locally -publish-local-all: publish-local-json publish-local-sdk publish-local-auto publish-local-codegen publish-local-scripts install-language-plugin +publish-local-all: publish-local-json publish-local-rpc publish-local-sdk publish-local-auto publish-local-codegen publish-local-scripts install-language-plugin # Publishes everything to Maven # TODO add publish-maven-auto once stable -publish-maven-all: publish-maven-json publish-maven-sdk publish-maven-codegen publish-maven-scripts +publish-maven-all: publish-maven-json publish-maven-rpc publish-maven-sdk publish-maven-codegen publish-maven-scripts # Runs all necessary checks before committing before-commit: compile-all test-all @@ -66,38 +67,38 @@ before-commit: compile-all test-all #################### # Compiles core besom SDK -compile-core: publish-local-json - scala-cli --power compile {{no-bloop-ci}} core --suppress-experimental-feature-warning +compile-core: publish-local-json publish-local-rpc + scala-cli --power compile {{no-bloop}} core --suppress-experimental-feature-warning # Compiles besom cats-effect extension compile-cats: publish-local-core - scala-cli --power compile {{no-bloop-ci}} besom-cats --suppress-experimental-feature-warning + scala-cli --power compile {{no-bloop}} besom-cats --suppress-experimental-feature-warning # Compiles besom zio extension compile-zio: publish-local-core - scala-cli --power compile {{no-bloop-ci}} besom-zio --suppress-experimental-feature-warning + scala-cli --power compile {{no-bloop}} besom-zio --suppress-experimental-feature-warning # Compiles all SDK modules compile-sdk: compile-core compile-cats compile-zio compile-compiler-plugin # Compiles besom compiler plugin compile-compiler-plugin: - scala-cli --power compile {{no-bloop-ci}} compiler-plugin --suppress-experimental-feature-warning + scala-cli --power compile {{no-bloop}} compiler-plugin --suppress-experimental-feature-warning # Runs tests for core besom SDK test-core: compile-core @if [ {{ coverage }} = "true" ]; then mkdir -p {{coverage-output-dir-core}}; fi - scala-cli --power test {{no-bloop-ci}} core {{ scala-cli-test-options-core }} --suppress-experimental-feature-warning + scala-cli --power test {{no-bloop}} core {{ scala-cli-test-options-core }} --suppress-experimental-feature-warning # Runs tests for besom cats-effect extension test-cats: publish-local-core @if [ {{ coverage }} = "true" ]; then mkdir -p {{coverage-output-dir-cats}}; fi - scala-cli --power test {{no-bloop-ci}} besom-cats {{ scala-cli-test-options-cats }} --suppress-experimental-feature-warning + scala-cli --power test {{no-bloop}} besom-cats {{ scala-cli-test-options-cats }} --suppress-experimental-feature-warning # Runs tests for besom zio extension test-zio: publish-local-core @if [ {{ coverage }} = "true" ]; then mkdir -p {{coverage-output-dir-zio}}; fi - scala-cli --power test {{no-bloop-ci}} besom-zio {{ scala-cli-test-options-zio }} --suppress-experimental-feature-warning + scala-cli --power test {{no-bloop}} besom-zio {{ scala-cli-test-options-zio }} --suppress-experimental-feature-warning # Runs all tests test-sdk: test-core test-cats test-zio @@ -109,36 +110,37 @@ publish-local-sdk: publish-local-core publish-local-cats publish-local-zio publi publish-maven-sdk: publish-maven-core publish-maven-cats publish-maven-zio publish-maven-compiler-plugin # Publishes locally core besom SDK -publish-local-core: publish-local-json - scala-cli --power publish local {{no-bloop-ci}} core --project-version {{besom-version}} --suppress-experimental-feature-warning +publish-local-core: publish-local-json publish-local-rpc + scala-cli --power publish local {{no-bloop}} core --project-version {{besom-version}} --suppress-experimental-feature-warning + scala-cli --power publish core --project-version {{besom-version}} --publish-repo "file://$HOME/.m2/repository" --suppress-experimental-feature-warning # Publishes locally besom cats-effect extension publish-local-cats: publish-local-core - scala-cli --power publish local {{no-bloop-ci}} besom-cats --project-version {{besom-version}} --suppress-experimental-feature-warning + scala-cli --power publish local {{no-bloop}} besom-cats --project-version {{besom-version}} --suppress-experimental-feature-warning # Publishes locally besom zio extension publish-local-zio: publish-local-core - scala-cli --power publish local {{no-bloop-ci}} besom-zio --project-version {{besom-version}} --suppress-experimental-feature-warning + scala-cli --power publish local {{no-bloop}} besom-zio --project-version {{besom-version}} --suppress-experimental-feature-warning # Publishes locally besom compiler plugin publish-local-compiler-plugin: - scala-cli --power publish local {{no-bloop-ci}} compiler-plugin --project-version {{besom-version}} --suppress-experimental-feature-warning + scala-cli --power publish local {{no-bloop}} compiler-plugin --project-version {{besom-version}} --suppress-experimental-feature-warning # Publishes core besom SDK to Maven publish-maven-core: - scala-cli --power publish {{no-bloop-ci}} core --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning + scala-cli --power publish {{no-bloop}} core --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning # Publishes besom cats-effect extension to Maven publish-maven-cats: - scala-cli --power publish {{no-bloop-ci}} besom-cats --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning + scala-cli --power publish {{no-bloop}} besom-cats --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning # Publishes besom zio extension to Maven publish-maven-zio: - scala-cli --power publish {{no-bloop-ci}} besom-zio --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning + scala-cli --power publish {{no-bloop}} besom-zio --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning # Publishes besom compiler plugin to Maven publish-maven-compiler-plugin: - scala-cli --power publish {{no-bloop-ci}} compiler-plugin --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning + scala-cli --power publish {{no-bloop}} compiler-plugin --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning # Cleans core build clean-core: @@ -167,17 +169,34 @@ clean-out: clean-coverage: clean-sdk rm -rf {{coverage-output-dir}} +#################### +# RPC +#################### + +compile-rpc: + scala-cli --power compile {{no-bloop}} besom-rpc --suppress-experimental-feature-warning + +clean-rpc: + scala-cli --power clean besom-rpc + +publish-local-rpc: + scala-cli --power publish local {{no-bloop}} besom-rpc --project-version {{besom-version}} --suppress-experimental-feature-warning + scala-cli --power publish besom-rpc --project-version {{besom-version}} --publish-repo "file://$HOME/.m2/repository" --suppress-experimental-feature-warning + +publish-maven-rpc: + scala-cli --power publish {{no-bloop}} besom-rpc --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning + #################### # Json #################### # Compiles json module compile-json: - scala-cli --power compile {{no-bloop-ci}} besom-json --suppress-experimental-feature-warning + scala-cli --power compile {{no-bloop}} besom-json --suppress-experimental-feature-warning # Runs tests for json module test-json: - scala-cli --power test {{no-bloop-ci}} besom-json --suppress-experimental-feature-warning + scala-cli --power test {{no-bloop}} besom-json --suppress-experimental-feature-warning # Cleans json module clean-json: @@ -185,12 +204,11 @@ clean-json: # Publishes locally json module publish-local-json: - scala-cli --power publish local {{no-bloop-ci}} besom-json --project-version {{besom-version}} --suppress-experimental-feature-warning + scala-cli --power publish local {{no-bloop}} besom-json --project-version {{besom-version}} --suppress-experimental-feature-warning # Publishes json module to Maven publish-maven-json: - scala-cli --power publish {{no-bloop-ci}} besom-json --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning - + scala-cli --power publish {{no-bloop}} besom-json --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning #################### # Auto @@ -229,7 +247,7 @@ tidy-language-plugin: # Packages .jar file with language plugin bootstrap library package-language-plugin-bootstrap: mkdir -p {{language-plugin-output-dir}} && \ - scala-cli --power package {{no-bloop-ci}} language-plugin/bootstrap --suppress-experimental-feature-warning --assembly -o {{language-plugin-output-dir}}/bootstrap.jar -f + scala-cli --power package {{no-bloop}} language-plugin/bootstrap --suppress-experimental-feature-warning --assembly -o {{language-plugin-output-dir}}/bootstrap.jar -f # Builds pulumi-language-scala binary build-language-plugin $GOOS="" $GOARCH="": @@ -351,11 +369,11 @@ clean-cfg: clean-cfg-lib clean-cfg-k8s # Compiles Besom codegen module compile-codegen: - scala-cli --power compile {{no-bloop-ci}} codegen --suppress-experimental-feature-warning + scala-cli --power compile {{no-bloop}} codegen --suppress-experimental-feature-warning # Runs tests for Besom codegen test-codegen: - scala-cli --power test {{no-bloop-ci}} codegen --suppress-experimental-feature-warning + scala-cli --power test {{no-bloop}} codegen --suppress-experimental-feature-warning # Cleans codegen build clean-codegen: @@ -363,11 +381,11 @@ clean-codegen: # Publishes locally Besom codegen publish-local-codegen: test-codegen - scala-cli --power publish local {{no-bloop-ci}} codegen --project-version {{besom-version}} --suppress-experimental-feature-warning + scala-cli --power publish local {{no-bloop}} codegen --project-version {{besom-version}} --suppress-experimental-feature-warning # Publishes Besom codegen publish-maven-codegen: test-codegen - scala-cli --power publish {{no-bloop-ci}} codegen --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning + scala-cli --power publish {{no-bloop}} codegen --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning #################### # crd2besom @@ -375,11 +393,11 @@ publish-maven-codegen: test-codegen # Compiles crd2besom module compile-crd2besom: - scala-cli --power compile {{no-bloop-ci}} crd2besom --suppress-experimental-feature-warning + scala-cli --power compile {{no-bloop}} crd2besom --suppress-experimental-feature-warning # Runs tests for crd2besom test-crd2besom: - scala-cli --power test {{no-bloop-ci}} crd2besom --suppress-experimental-feature-warning + scala-cli --power test {{no-bloop}} crd2besom --suppress-experimental-feature-warning # Cleans crd2besom build clean-crd2besom: @@ -387,7 +405,7 @@ clean-crd2besom: # Build crd2besom binary build-crd2besom: - scala-cli --power package {{no-bloop-ci}} crd2besom --suppress-experimental-feature-warning --graal -o .out/crd2besom/bin/$(arch)/crd2besom + scala-cli --power package {{no-bloop}} crd2besom --suppress-experimental-feature-warning --graal -o .out/crd2besom/bin/$(arch)/crd2besom #################### # Integration testing @@ -395,7 +413,7 @@ build-crd2besom: # Runs all integration tests test-integration: test-integration-core test-integration-compiler-plugin test-integration-codegen test-integration-language-plugin - scala-cli --power test {{no-bloop-ci}} integration-tests + scala-cli --power test {{no-bloop}} integration-tests # Cleans after integration tests clean-test-integration: clean-test-integration-codegen @@ -403,26 +421,26 @@ clean-test-integration: clean-test-integration-codegen # Runs integration tests for core test-integration-core: publish-local-codegen publish-local-sdk install-language-plugin publish-local-compiler-plugin - scala-cli --power test {{no-bloop-ci}} integration-tests --test-only 'besom.integration.core*' + scala-cli --power test {{no-bloop}} integration-tests --test-only 'besom.integration.core*' # Runs integration tests for compiler plugin test-integration-compiler-plugin: publish-local-codegen publish-local-core install-language-plugin publish-local-compiler-plugin - scala-cli --power test {{no-bloop-ci}} integration-tests --test-only 'besom.integration.compilerplugin*' + scala-cli --power test {{no-bloop}} integration-tests --test-only 'besom.integration.compilerplugin*' # Runs integration tests for language plugin test-integration-language-plugin: publish-local-codegen publish-local-core install-language-plugin publish-local-compiler-plugin export GITHUB_TOKEN=$(gh auth token); \ - scala-cli --power test {{no-bloop-ci}} integration-tests --test-only 'besom.integration.languageplugin*' + scala-cli --power test {{no-bloop}} integration-tests --test-only 'besom.integration.languageplugin*' # Runs fast integration tests for codegen test-integration-codegen: publish-local-core publish-local-codegen export GITHUB_TOKEN=$(gh auth token); \ - scala-cli --power test {{no-bloop-ci}} integration-tests --test-only 'besom.integration.codegen*' + scala-cli --power test {{no-bloop}} integration-tests --test-only 'besom.integration.codegen*' # Runs fast&slow integration tests for codegen test-integration-codegen-slow: publish-local-core publish-local-codegen export GITHUB_TOKEN=$(gh auth token); \ - scala-cli --power test {{no-bloop-ci}} integration-tests --test-only 'besom.integration.codegen*' -- --include-categories=Slow + scala-cli --power test {{no-bloop}} integration-tests --test-only 'besom.integration.codegen*' -- --include-categories=Slow # Cleans after the codegen integration tests clean-test-integration-codegen: @@ -430,7 +448,7 @@ clean-test-integration-codegen: # Copies test schemas from pulumi repo to the testdata directory copy-test-schemas: - scala-cli run {{no-bloop-ci}} --suppress-experimental-feature-warning --suppress-directives-in-multiple-files-warning scripts -- schemas all + scala-cli run {{no-bloop}} --suppress-experimental-feature-warning --suppress-directives-in-multiple-files-warning scripts -- schemas all #################### # Templates and examples @@ -441,7 +459,8 @@ test-template template-name: @echo "----------------------------------------" @echo "Testing template {{template-name}}" pulumi --non-interactive --logtostderr --color=never --emoji=false new -y --force --generate-only --dir target/test/{{template-name}} -n templates-test-{{template-name}} --stack templates-test-{{template-name}} ../../../templates/{{template-name}}/ - scala-cli compile {{no-bloop-ci}} target/test/{{template-name}} {{ci-opts}} --suppress-experimental-feature-warning --suppress-directives-in-multiple-files-warning + # TODO drop snapshots + scala-cli compile --server=false --repository=sonatype:snapshots target/test/{{template-name}} {{ci-opts}} --suppress-experimental-feature-warning --suppress-directives-in-multiple-files-warning # Cleans after a template test clean-test-template template-name: @@ -462,10 +481,11 @@ clean-test-templates: # Runs an example test test-example example-name: - @echo "----------------------------------------" - @echo "Testing example {{example-name}}" - scala-cli bloop exit # allow different examples use different jvms - scala-cli compile -v -v -v {{no-bloop-ci}} examples/{{example-name}} {{ci-opts}} --suppress-experimental-feature-warning --suppress-directives-in-multiple-files-warning + #!/usr/bin/env bash + echo "----------------------------------------" + echo "Testing example {{example-name}}" + # TODO drop snapshots + scala-cli compile --server=false examples/{{example-name}} --repository=sonatype:snapshots {{ci-opts}} --suppress-experimental-feature-warning --suppress-directives-in-multiple-files-warning # Cleans after an example test clean-test-example example-name: @@ -501,7 +521,7 @@ clean-test-markdown: # Compiles Besom scripts module compile-scripts: publish-local-codegen - scala-cli --power compile {{no-bloop-ci}} scripts --suppress-experimental-feature-warning + scala-cli --power compile {{no-bloop}} scripts --suppress-experimental-feature-warning # Clean Besom scripts module clean-scripts: @@ -509,19 +529,19 @@ clean-scripts: # Runs tests for Besom scripts test-scripts: - scala-cli --power test {{no-bloop-ci}} scripts --suppress-experimental-feature-warning + scala-cli --power test {{no-bloop}} scripts --suppress-experimental-feature-warning # Publishes locally Besom scripts module publish-local-scripts: test-scripts - scala-cli --power publish local {{no-bloop-ci}} scripts --project-version {{besom-version}} --suppress-experimental-feature-warning + scala-cli --power publish local {{no-bloop}} scripts --project-version {{besom-version}} --suppress-experimental-feature-warning # Publishes Besom scripts module publish-maven-scripts: test-scripts - scala-cli --power publish {{no-bloop-ci}} scripts --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning + scala-cli --power publish {{no-bloop}} scripts --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning # Use Besom scripts directly cli *ARGS: - scala-cli run {{no-bloop-ci}} scripts {{ci-opts}} --suppress-experimental-feature-warning --suppress-directives-in-multiple-files-warning scripts -- {{ARGS}} + scala-cli run {{no-bloop}} scripts {{ci-opts}} --suppress-experimental-feature-warning --suppress-directives-in-multiple-files-warning scripts -- {{ARGS}} # Create or Update GitHub release upsert-gh-release: @@ -589,8 +609,8 @@ clean-slate-liftoff: clean-sdk #!/usr/bin/env sh just publish-local-core just publish-local-compiler-plugin - scala-cli run {{no-bloop-ci}} codegen -- named kubernetes 4.2.0 - scala-cli --power publish local {{no-bloop-ci}} .out/codegen/kubernetes/4.2.0/ --suppress-experimental-feature-warning --suppress-directives-in-multiple-files-warning + scala-cli run {{no-bloop}} codegen -- named kubernetes 4.2.0 + scala-cli --power publish local {{no-bloop}} .out/codegen/kubernetes/4.2.0/ --suppress-experimental-feature-warning --suppress-directives-in-multiple-files-warning just clean-liftoff just liftoff diff --git a/README.md b/README.md index e616fba3..780b33d6 100644 --- a/README.md +++ b/README.md @@ -130,12 +130,15 @@ import besom.api.aws > Besom **does NOT depend on Pulumi Java SDK**, it is a completely separate implementation. ## Tips -- Whenever you use Besom outside the `Pulumi.run` block, pass [`Context`](https://virtuslab.github.io/besom/docs/context) with `(using besom.Context)` - Resources are initialized lazily. To make them appear in your physical infrastructure make sure -their evaluation is triggered directly or transitively from the main for-comprehension block of your Pulumi program. +their evaluation is triggered directly or transitively (by referencing them or resources that depend on them) by +including them in the final `Stack` structure of your program. - Use whatever Scala concepts you are familiar with, infrastructure as code in Besom is still a Scala program, so you have the full potential of the language to work with. - Pay attention to the types. You will be instantiating case classes to pass parameters, note their package of origin. +- Some Pulumi functions that allow you to access the metadata of the current stack require access to the `Context`. +`Context` is available as a given (implicitly) in the `Pulumi.run` block, but you can also require it explicitly +in any of your functions with `(using Context)`. ## Requirements diff --git a/auto/project.scala b/auto/project.scala index c53e10c2..41f69fa5 100644 --- a/auto/project.scala +++ b/auto/project.scala @@ -22,4 +22,3 @@ //> using publish.repository "central" //> using publish.developer "lbialy|Łukasz Biały|https://github.com/lbialy" //> using publish.developer "pawelprazak|Paweł Prażak|https://github.com/pawelprazak" -//> using repository sonatype:snapshots \ No newline at end of file diff --git a/besom-cats/project.scala b/besom-cats/project.scala index b2752bfc..dc813b80 100644 --- a/besom-cats/project.scala +++ b/besom-cats/project.scala @@ -15,4 +15,4 @@ //> using publish.developer "lbialy|Łukasz Biały|https://github.com/lbialy" //> using publish.developer "prolativ|Michał Pałka|https://github.com/prolativ" //> using publish.developer "KacperFKorban|Kacper Korban|https://github.com/KacperFKorban" -//> using repository sonatype:snapshots + diff --git a/besom-cats/src/main/scala/runtime.scala b/besom-cats/src/main/scala/runtime.scala index b4e98454..cbdfe8be 100644 --- a/besom-cats/src/main/scala/runtime.scala +++ b/besom-cats/src/main/scala/runtime.scala @@ -47,8 +47,6 @@ trait CatsEffectModule extends BesomModule: implicit val toFutureCatsEffectIO: Result.ToFuture[Eff] = new Result.ToFuture[IO]: def eval[A](fa: => IO[A]): () => Future[A] = () => fa.uncancelable.unsafeToFuture()(using ioRuntime) - // override def run(program: Context ?=> Output[Exports]): Future[Unit] = ??? - object Pulumi extends CatsEffectModule export Pulumi.{component => _, *, given} @@ -70,10 +68,10 @@ import scala.reflect.Typeable * @return * The component resource. */ -def component[A <: ComponentResource & Product: RegistersOutputs: Typeable](using ctx: Context)( +def component[A <: ComponentResource & Product: RegistersOutputs: Typeable]( name: NonEmptyString, typ: ResourceType, opts: ComponentResourceOptions = ComponentResourceOptions() )( - f: Context ?=> ComponentBase ?=> A + f: ComponentBase ?=> A ): Output[A] = Pulumi.component(name, typ, opts)(f) diff --git a/besom-cfg/k8s/project.scala b/besom-cfg/k8s/project.scala index 31de5641..14f849d9 100644 --- a/besom-cfg/k8s/project.scala +++ b/besom-cfg/k8s/project.scala @@ -21,4 +21,4 @@ //> using publish.developer "prolativ|Michał Pałka|https://github.com/prolativ" //> using publish.developer "KacperFKorban|Kacper Korban|https://github.com/KacperFKorban" //> using publish.developer "pawelprazak|Paweł Prażak|https://github.com/pawelprazak" -//> using repository sonatype:snapshots + diff --git a/besom-cfg/k8s/src/main/scala/ConfiguredContainerArgs.scala b/besom-cfg/k8s/src/main/scala/ConfiguredContainerArgs.scala index a99f7863..d95d75b2 100644 --- a/besom-cfg/k8s/src/main/scala/ConfiguredContainerArgs.scala +++ b/besom-cfg/k8s/src/main/scala/ConfiguredContainerArgs.scala @@ -1,7 +1,7 @@ package besom.cfg.k8s import besom.cfg.internal.* -import besom.types.{Input, Context, Output} +import besom.types.{Input, Output} import besom.cfg.* import besom.json.* import besom.cfg.containers.* @@ -15,7 +15,7 @@ import besom.cfg.k8s.syntax.* object syntax: extension (s: Struct) - def foldedToEnvVarArgs(using Context): Output[List[EnvVarArgs]] = + def foldedToEnvVarArgs: Output[List[EnvVarArgs]] = s.foldToEnv.map(_.map { case (k, v) => EnvVarArgs(name = k, value = v) }) object ConfiguredContainerArgs: @@ -48,7 +48,7 @@ object ConfiguredContainerArgs: volumeDevices: Input.Optional[List[Input[VolumeDeviceArgs]]] = None, volumeMounts: Input.Optional[List[Input[VolumeMountArgs]]] = None, workingDir: Input.Optional[String] = None - )(using ctx: Context) = ${ + ) = ${ applyImpl( 'name, 'image, @@ -74,8 +74,7 @@ object ConfiguredContainerArgs: 'tty, 'volumeDevices, 'volumeMounts, - 'workingDir, - 'ctx + 'workingDir ) } @@ -104,8 +103,7 @@ object ConfiguredContainerArgs: tty: Expr[Input.Optional[Boolean]], volumeDevices: Expr[Input.Optional[List[Input[VolumeDeviceArgs]]]], volumeMounts: Expr[Input.Optional[List[Input[VolumeMountArgs]]]], - workingDir: Expr[Input.Optional[String]], - context: Expr[Context] + workingDir: Expr[Input.Optional[String]] )(using Quotes): Expr[ContainerArgs] = import quotes.reflect.* @@ -130,9 +128,10 @@ object ConfiguredContainerArgs: case Right(()) => val envExpr = '{ - val envOutput = ${ env }.asOptionOutput()(using ${ context }) + val envOutput = ${ env }.asOptionOutput() val conf = ${ configuration } - val configurationAsEnvVarArgs = conf.foldedToEnvVarArgs(using $context) + val configurationAsEnvVarArgs = conf.foldedToEnvVarArgs + envOutput.zip(configurationAsEnvVarArgs).map { case (Some(envVarArgsList), envVarArgsListFromConf) => envVarArgsList ++ envVarArgsListFromConf case (None, envVarArgsListFromConf) => envVarArgsListFromConf @@ -165,7 +164,7 @@ object ConfiguredContainerArgs: volumeDevices = $volumeDevices, volumeMounts = $volumeMounts, workingDir = $workingDir - )(using $context) + ) } end match end applyImpl diff --git a/besom-cfg/k8s/src/test/scala/DummyContext.scala b/besom-cfg/k8s/src/test/scala/DummyContext.scala index ef12aaff..eb264a80 100644 --- a/besom-cfg/k8s/src/test/scala/DummyContext.scala +++ b/besom-cfg/k8s/src/test/scala/DummyContext.scala @@ -57,7 +57,7 @@ object DummyContext: config <- Config(runInfo.project, isProjectName = true, configMap = configMap, configSecretKeys = configSecretKeys) resources <- Resources() given Context = Context.create(runInfo, featureSupport, config, logger, monitor, engine, taskTracker, resources, memo, stackPromise) - _ <- stackPromise.fulfill(StackResource()(using ComponentBase(Output(besom.types.URN.empty)))) + _ <- stackPromise.fulfill(StackResource()(using ComponentBase(Output.pure(besom.types.URN.empty)))) yield summon[Context] end DummyContext diff --git a/besom-cfg/k8s/src/test/scala/RunOutput.scala b/besom-cfg/k8s/src/test/scala/RunOutput.scala index 372de734..f4bea5a5 100644 --- a/besom-cfg/k8s/src/test/scala/RunOutput.scala +++ b/besom-cfg/k8s/src/test/scala/RunOutput.scala @@ -3,11 +3,11 @@ package besom.internal import scala.concurrent.Future trait RunOutput[F[+_]]: - def run[A](output: Output[A]): Option[A] + def run[A](output: Output[A])(using Context): Option[A] object RunOutput: given runOutputForFuture(using RunResult[Future]): RunOutput[Future] = new RunOutput[Future]: - def run[A](output: Output[A]): Option[A] = RunResult.unsafeRunSync(output.getData)().getValue + def run[A](output: Output[A])(using Context): Option[A] = RunResult.unsafeRunSync(output.getData)().getValue - extension [F[+_], A](output: Output[A])(using ro: RunOutput[F]) def unsafeRunSync(): Option[A] = ro.run(output) - extension [F[+_], A](result: Result[A])(using rr: RunResult[F]) def unsafeRunSync(): A = rr.run(result) + extension [F[+_], A](output: Output[A])(using ro: RunOutput[F]) def unsafeRunSync()(using Context): Option[A] = ro.run(output) + extension [F[+_], A](result: Result[A])(using rr: RunResult[F]) def unsafeRunSync(): A = rr.run(result) diff --git a/besom-cfg/k8s/src/test/scala/RunResult.scala b/besom-cfg/k8s/src/test/scala/RunResult.scala index e2776687..ff6e4b50 100644 --- a/besom-cfg/k8s/src/test/scala/RunResult.scala +++ b/besom-cfg/k8s/src/test/scala/RunResult.scala @@ -8,7 +8,7 @@ trait RunResult[F[+_]]: object RunResult: given RunResult[Future] = new RunResult[Future]: given ExecutionContext = ExecutionContext.fromExecutorService( - null, // FJP does seem to swallow fatals + null, // global Future EC reports fatals and uncaught exceptions to stderr, we want to quit on fatals (t: Throwable) => // TODO this has to contain a link to github issue tracker to allow user to easily create a bug report, this is EXTREMELY IMPORTANT scribe.error("Uncaught fatal error in Future Runtime", t) diff --git a/besom-cfg/lib/project.scala b/besom-cfg/lib/project.scala index a83d9073..138acc61 100644 --- a/besom-cfg/lib/project.scala +++ b/besom-cfg/lib/project.scala @@ -16,4 +16,3 @@ //> using publish.developer "prolativ|Michał Pałka|https://github.com/prolativ" //> using publish.developer "KacperFKorban|Kacper Korban|https://github.com/KacperFKorban" //> using publish.developer "pawelprazak|Paweł Prażak|https://github.com/pawelprazak" -//> using repository sonatype:snapshots \ No newline at end of file diff --git a/besom-cfg/lib/src/main/scala/Struct.scala b/besom-cfg/lib/src/main/scala/Struct.scala index 0a24cb5e..36f79e17 100644 --- a/besom-cfg/lib/src/main/scala/Struct.scala +++ b/besom-cfg/lib/src/main/scala/Struct.scala @@ -4,7 +4,7 @@ import scala.language.dynamics import scala.quoted.* import scala.collection.immutable.ListMap import besom.cfg.internal.MetaUtils -import besom.types.{Output, Context} +import besom.types.Output import scala.util.chaining.* // possible types under `Any`: @@ -18,7 +18,7 @@ class Struct private (val _values: ListMap[String, Any]) extends Selectable: onStruct: Map[String, Output[B]] => Output[B], onList: List[B] => Output[B], onValue: Any => Output[B] - )(using Context): Output[B] = + ): Output[B] = val onOutput: Output[_] => Output[B] = _.flatMap { case s: Struct => s.fold(onStruct, onList, onValue) case a => onValue(a) @@ -91,7 +91,7 @@ object Struct extends Dynamic: ) extension (s: Struct) - def foldToEnv(using Context): Output[List[(String, String)]] = s.fold[List[(String, String)]]( + def foldToEnv: Output[List[(String, String)]] = s.fold[List[(String, String)]]( onStruct = { mapB => mapB.foldLeft(Output(List.empty[(String, String)])) { case (acc, (k, v)) => acc.flatMap { accList => diff --git a/besom-rpc/project.scala b/besom-rpc/project.scala new file mode 100644 index 00000000..5f13b0f3 --- /dev/null +++ b/besom-rpc/project.scala @@ -0,0 +1,18 @@ +//> using scala 3.3.3 + +//> using options "-java-output-version:11" + +// TODO dependency bumps +//> using dep "com.google.protobuf:protobuf-java-util:3.25.1" +//> using dep "com.thesamet.scalapb::scalapb-runtime:0.11.15" +//> using dep "com.thesamet.scalapb::scalapb-runtime-grpc:0.11.15" + +//> using publish.name "besom-rpc" +//> using publish.organization "org.virtuslab" +//> using publish.url "https://github.com/VirtusLab/besom" +//> using publish.vcs "github:VirtusLab/besom" +//> using publish.license "Apache-2.0" +//> using publish.repository "central" +//> using publish.developer "lbialy|Łukasz Biały|https://github.com/lbialy" +//> using publish.developer "prolativ|Michał Pałka|https://github.com/prolativ" + diff --git a/core/src/main/scala/besom/rpc/com/google/rpc/status/Status.scala b/besom-rpc/src/main/scala/com/google/rpc/status/Status.scala similarity index 96% rename from core/src/main/scala/besom/rpc/com/google/rpc/status/Status.scala rename to besom-rpc/src/main/scala/com/google/rpc/status/Status.scala index 139c30d3..c2212611 100644 --- a/core/src/main/scala/besom/rpc/com/google/rpc/status/Status.scala +++ b/besom-rpc/src/main/scala/com/google/rpc/status/Status.scala @@ -76,8 +76,8 @@ final case class Status( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[Status] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -208,21 +208,21 @@ object Status extends scalapb.GeneratedMessageCompanion[com.google.rpc.status.St } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = StatusProto.javaDescriptor.getMessageTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = StatusProto.scalaDescriptor.messages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 3 => __out = com.google.protobuf.any.Any } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = com.google.rpc.status.Status( code = 0, message = "", details = _root_.scala.Seq.empty ) - implicit class StatusLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.rpc.status.Status]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, com.google.rpc.status.Status](_l) { + implicit class StatusLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, com.google.rpc.status.Status]) extends _root_.scalapb.lenses.MessageLens[UpperPB, com.google.rpc.status.Status](_l) { def code: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.code)((c_, f_) => c_.copy(code = f_)) def message: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.message)((c_, f_) => c_.copy(message = f_)) def details: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[com.google.protobuf.any.Any]] = field(_.details)((c_, f_) => c_.copy(details = f_)) diff --git a/core/src/main/scala/besom/rpc/com/google/rpc/status/StatusProto.scala b/besom-rpc/src/main/scala/com/google/rpc/status/StatusProto.scala similarity index 94% rename from core/src/main/scala/besom/rpc/com/google/rpc/status/StatusProto.scala rename to besom-rpc/src/main/scala/com/google/rpc/status/StatusProto.scala index 81cdd321..edcbdc25 100644 --- a/core/src/main/scala/besom/rpc/com/google/rpc/status/StatusProto.scala +++ b/besom-rpc/src/main/scala/com/google/rpc/status/StatusProto.scala @@ -9,8 +9,8 @@ object StatusProto extends _root_.scalapb.GeneratedFileObject { lazy val dependencies: Seq[_root_.scalapb.GeneratedFileObject] = Seq( com.google.protobuf.any.AnyProto ) - lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( com.google.rpc.status.Status ) private lazy val ProtoBytes: _root_.scala.Array[Byte] = diff --git a/core/src/main/scala/besom/rpc/pulumirpc/alias/Alias.scala b/besom-rpc/src/main/scala/pulumirpc/alias/Alias.scala similarity index 96% rename from core/src/main/scala/besom/rpc/pulumirpc/alias/Alias.scala rename to besom-rpc/src/main/scala/pulumirpc/alias/Alias.scala index 47dca5db..1506df9e 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/alias/Alias.scala +++ b/besom-rpc/src/main/scala/pulumirpc/alias/Alias.scala @@ -11,8 +11,8 @@ final case class Alias( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[Alias] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 if (alias.urn.isDefined) { val __value = alias.urn.get @@ -111,18 +111,18 @@ object Alias extends scalapb.GeneratedMessageCompanion[pulumirpc.alias.Alias] { } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = AliasProto.javaDescriptor.getMessageTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = AliasProto.scalaDescriptor.messages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = pulumirpc.alias.Alias.Spec } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.alias.Alias.Spec ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.alias.Alias( alias = pulumirpc.alias.Alias.Alias.Empty ) @@ -178,8 +178,8 @@ object Alias extends scalapb.GeneratedMessageCompanion[pulumirpc.alias.Alias] { unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[Spec] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -372,9 +372,9 @@ object Alias extends scalapb.GeneratedMessageCompanion[pulumirpc.alias.Alias] { } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.alias.Alias.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.alias.Alias.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.alias.Alias.Spec( name = "", `type` = "", @@ -415,7 +415,7 @@ object Alias extends scalapb.GeneratedMessageCompanion[pulumirpc.alias.Alias] { override def number: _root_.scala.Int = 6 } } - implicit class SpecLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.alias.Alias.Spec]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.alias.Alias.Spec](_l) { + implicit class SpecLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.alias.Alias.Spec]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.alias.Alias.Spec](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def `type`: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.`type`)((c_, f_) => c_.copy(`type` = f_)) def stack: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.stack)((c_, f_) => c_.copy(stack = f_)) @@ -446,7 +446,7 @@ object Alias extends scalapb.GeneratedMessageCompanion[pulumirpc.alias.Alias] { // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.Alias.Spec]) } - implicit class AliasLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.alias.Alias]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.alias.Alias](_l) { + implicit class AliasLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.alias.Alias]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.alias.Alias](_l) { def urn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.getUrn)((c_, f_) => c_.copy(alias = pulumirpc.alias.Alias.Alias.Urn(f_))) def spec: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.alias.Alias.Spec] = field(_.getSpec)((c_, f_) => c_.copy(alias = pulumirpc.alias.Alias.Alias.Spec(f_))) def alias: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.alias.Alias.Alias] = field(_.alias)((c_, f_) => c_.copy(alias = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/alias/AliasProto.scala b/besom-rpc/src/main/scala/pulumirpc/alias/AliasProto.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/alias/AliasProto.scala rename to besom-rpc/src/main/scala/pulumirpc/alias/AliasProto.scala index b6f3711c..a2ab0646 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/alias/AliasProto.scala +++ b/besom-rpc/src/main/scala/pulumirpc/alias/AliasProto.scala @@ -7,8 +7,8 @@ package pulumirpc.alias object AliasProto extends _root_.scalapb.GeneratedFileObject { lazy val dependencies: Seq[_root_.scalapb.GeneratedFileObject] = Seq.empty - lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( pulumirpc.alias.Alias ) private lazy val ProtoBytes: _root_.scala.Array[Byte] = diff --git a/core/src/main/scala/besom/rpc/pulumirpc/callback/Callback.scala b/besom-rpc/src/main/scala/pulumirpc/callback/Callback.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/callback/Callback.scala rename to besom-rpc/src/main/scala/pulumirpc/callback/Callback.scala index 3eacb74c..d65b5ca1 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/callback/Callback.scala +++ b/besom-rpc/src/main/scala/pulumirpc/callback/Callback.scala @@ -17,8 +17,8 @@ final case class Callback( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[Callback] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -128,14 +128,14 @@ object Callback extends scalapb.GeneratedMessageCompanion[pulumirpc.callback.Cal } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = CallbackProto.javaDescriptor.getMessageTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = CallbackProto.scalaDescriptor.messages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.callback.Callback( target = "", token = "" ) - implicit class CallbackLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.callback.Callback]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.callback.Callback](_l) { + implicit class CallbackLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.callback.Callback]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.callback.Callback](_l) { def target: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.target)((c_, f_) => c_.copy(target = f_)) def token: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.token)((c_, f_) => c_.copy(token = f_)) } diff --git a/core/src/main/scala/besom/rpc/pulumirpc/callback/CallbackInvokeRequest.scala b/besom-rpc/src/main/scala/pulumirpc/callback/CallbackInvokeRequest.scala similarity index 93% rename from core/src/main/scala/besom/rpc/pulumirpc/callback/CallbackInvokeRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/callback/CallbackInvokeRequest.scala index 3b60bf88..696a0104 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/callback/CallbackInvokeRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/callback/CallbackInvokeRequest.scala @@ -17,8 +17,8 @@ final case class CallbackInvokeRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[CallbackInvokeRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -128,14 +128,14 @@ object CallbackInvokeRequest extends scalapb.GeneratedMessageCompanion[pulumirpc } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = CallbackProto.javaDescriptor.getMessageTypes().get(1) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = CallbackProto.scalaDescriptor.messages(1) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.callback.CallbackInvokeRequest( token = "", request = _root_.com.google.protobuf.ByteString.EMPTY ) - implicit class CallbackInvokeRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.callback.CallbackInvokeRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.callback.CallbackInvokeRequest](_l) { + implicit class CallbackInvokeRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.callback.CallbackInvokeRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.callback.CallbackInvokeRequest](_l) { def token: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.token)((c_, f_) => c_.copy(token = f_)) def request: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.request)((c_, f_) => c_.copy(request = f_)) } diff --git a/core/src/main/scala/besom/rpc/pulumirpc/callback/CallbackInvokeResponse.scala b/besom-rpc/src/main/scala/pulumirpc/callback/CallbackInvokeResponse.scala similarity index 92% rename from core/src/main/scala/besom/rpc/pulumirpc/callback/CallbackInvokeResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/callback/CallbackInvokeResponse.scala index 0c85d4c8..4c299aec 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/callback/CallbackInvokeResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/callback/CallbackInvokeResponse.scala @@ -14,8 +14,8 @@ final case class CallbackInvokeResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[CallbackInvokeResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -101,13 +101,13 @@ object CallbackInvokeResponse extends scalapb.GeneratedMessageCompanion[pulumirp } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = CallbackProto.javaDescriptor.getMessageTypes().get(2) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = CallbackProto.scalaDescriptor.messages(2) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.callback.CallbackInvokeResponse( response = _root_.com.google.protobuf.ByteString.EMPTY ) - implicit class CallbackInvokeResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.callback.CallbackInvokeResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.callback.CallbackInvokeResponse](_l) { + implicit class CallbackInvokeResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.callback.CallbackInvokeResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.callback.CallbackInvokeResponse](_l) { def response: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.response)((c_, f_) => c_.copy(response = f_)) } final val RESPONSE_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/callback/CallbackProto.scala b/besom-rpc/src/main/scala/pulumirpc/callback/CallbackProto.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/callback/CallbackProto.scala rename to besom-rpc/src/main/scala/pulumirpc/callback/CallbackProto.scala index 1de3bb9f..8c093687 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/callback/CallbackProto.scala +++ b/besom-rpc/src/main/scala/pulumirpc/callback/CallbackProto.scala @@ -7,8 +7,8 @@ package pulumirpc.callback object CallbackProto extends _root_.scalapb.GeneratedFileObject { lazy val dependencies: Seq[_root_.scalapb.GeneratedFileObject] = Seq.empty - lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( pulumirpc.callback.Callback, pulumirpc.callback.CallbackInvokeRequest, pulumirpc.callback.CallbackInvokeResponse diff --git a/core/src/main/scala/besom/rpc/pulumirpc/callback/CallbacksGrpc.scala b/besom-rpc/src/main/scala/pulumirpc/callback/CallbacksGrpc.scala similarity index 100% rename from core/src/main/scala/besom/rpc/pulumirpc/callback/CallbacksGrpc.scala rename to besom-rpc/src/main/scala/pulumirpc/callback/CallbacksGrpc.scala diff --git a/core/src/main/scala/besom/rpc/pulumirpc/codegen/hcl/Diagnostic.scala b/besom-rpc/src/main/scala/pulumirpc/codegen/hcl/Diagnostic.scala similarity index 96% rename from core/src/main/scala/besom/rpc/pulumirpc/codegen/hcl/Diagnostic.scala rename to besom-rpc/src/main/scala/pulumirpc/codegen/hcl/Diagnostic.scala index 1b263fc8..5dd4c45f 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/codegen/hcl/Diagnostic.scala +++ b/besom-rpc/src/main/scala/pulumirpc/codegen/hcl/Diagnostic.scala @@ -34,8 +34,8 @@ final case class Diagnostic( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[Diagnostic] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -209,16 +209,16 @@ object Diagnostic extends scalapb.GeneratedMessageCompanion[pulumirpc.codegen.hc } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = HclProto.javaDescriptor.getMessageTypes().get(2) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = HclProto.scalaDescriptor.messages(2) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 4 => __out = pulumirpc.codegen.hcl.Range case 5 => __out = pulumirpc.codegen.hcl.Range } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = { + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = { (__fieldNumber: @_root_.scala.unchecked) match { case 1 => pulumirpc.codegen.hcl.DiagnosticSeverity } @@ -230,7 +230,7 @@ object Diagnostic extends scalapb.GeneratedMessageCompanion[pulumirpc.codegen.hc subject = _root_.scala.None, context = _root_.scala.None ) - implicit class DiagnosticLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.codegen.hcl.Diagnostic]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.codegen.hcl.Diagnostic](_l) { + implicit class DiagnosticLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.codegen.hcl.Diagnostic]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.codegen.hcl.Diagnostic](_l) { def severity: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.codegen.hcl.DiagnosticSeverity] = field(_.severity)((c_, f_) => c_.copy(severity = f_)) def summary: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.summary)((c_, f_) => c_.copy(summary = f_)) def detail: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.detail)((c_, f_) => c_.copy(detail = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/codegen/hcl/DiagnosticSeverity.scala b/besom-rpc/src/main/scala/pulumirpc/codegen/hcl/DiagnosticSeverity.scala similarity index 100% rename from core/src/main/scala/besom/rpc/pulumirpc/codegen/hcl/DiagnosticSeverity.scala rename to besom-rpc/src/main/scala/pulumirpc/codegen/hcl/DiagnosticSeverity.scala diff --git a/core/src/main/scala/besom/rpc/pulumirpc/codegen/hcl/HclProto.scala b/besom-rpc/src/main/scala/pulumirpc/codegen/hcl/HclProto.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/codegen/hcl/HclProto.scala rename to besom-rpc/src/main/scala/pulumirpc/codegen/hcl/HclProto.scala index 3fee8491..8fc039a8 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/codegen/hcl/HclProto.scala +++ b/besom-rpc/src/main/scala/pulumirpc/codegen/hcl/HclProto.scala @@ -7,8 +7,8 @@ package pulumirpc.codegen.hcl object HclProto extends _root_.scalapb.GeneratedFileObject { lazy val dependencies: Seq[_root_.scalapb.GeneratedFileObject] = Seq.empty - lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( pulumirpc.codegen.hcl.Pos, pulumirpc.codegen.hcl.Range, pulumirpc.codegen.hcl.Diagnostic diff --git a/core/src/main/scala/besom/rpc/pulumirpc/codegen/hcl/Pos.scala b/besom-rpc/src/main/scala/pulumirpc/codegen/hcl/Pos.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/codegen/hcl/Pos.scala rename to besom-rpc/src/main/scala/pulumirpc/codegen/hcl/Pos.scala index 2a6fcc0e..8ce6b91a 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/codegen/hcl/Pos.scala +++ b/besom-rpc/src/main/scala/pulumirpc/codegen/hcl/Pos.scala @@ -32,8 +32,8 @@ final case class Pos( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[Pos] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -167,15 +167,15 @@ object Pos extends scalapb.GeneratedMessageCompanion[pulumirpc.codegen.hcl.Pos] } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = HclProto.javaDescriptor.getMessageTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = HclProto.scalaDescriptor.messages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.codegen.hcl.Pos( line = 0L, column = 0L, byte = 0L ) - implicit class PosLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.codegen.hcl.Pos]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.codegen.hcl.Pos](_l) { + implicit class PosLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.codegen.hcl.Pos]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.codegen.hcl.Pos](_l) { def line: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Long] = field(_.line)((c_, f_) => c_.copy(line = f_)) def column: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Long] = field(_.column)((c_, f_) => c_.copy(column = f_)) def byte: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Long] = field(_.byte)((c_, f_) => c_.copy(byte = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/codegen/hcl/Range.scala b/besom-rpc/src/main/scala/pulumirpc/codegen/hcl/Range.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/codegen/hcl/Range.scala rename to besom-rpc/src/main/scala/pulumirpc/codegen/hcl/Range.scala index 0e8be286..c164ed81 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/codegen/hcl/Range.scala +++ b/besom-rpc/src/main/scala/pulumirpc/codegen/hcl/Range.scala @@ -20,8 +20,8 @@ final case class Range( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[Range] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -147,22 +147,22 @@ object Range extends scalapb.GeneratedMessageCompanion[pulumirpc.codegen.hcl.Ran } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = HclProto.javaDescriptor.getMessageTypes().get(1) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = HclProto.scalaDescriptor.messages(1) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = pulumirpc.codegen.hcl.Pos case 3 => __out = pulumirpc.codegen.hcl.Pos } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.codegen.hcl.Range( filename = "", start = _root_.scala.None, end = _root_.scala.None ) - implicit class RangeLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.codegen.hcl.Range]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.codegen.hcl.Range](_l) { + implicit class RangeLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.codegen.hcl.Range]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.codegen.hcl.Range](_l) { def filename: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.filename)((c_, f_) => c_.copy(filename = f_)) def start: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.codegen.hcl.Pos] = field(_.getStart)((c_, f_) => c_.copy(start = _root_.scala.Option(f_))) def optionalStart: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[pulumirpc.codegen.hcl.Pos]] = field(_.start)((c_, f_) => c_.copy(start = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/engine/EngineGrpc.scala b/besom-rpc/src/main/scala/pulumirpc/engine/EngineGrpc.scala similarity index 100% rename from core/src/main/scala/besom/rpc/pulumirpc/engine/EngineGrpc.scala rename to besom-rpc/src/main/scala/pulumirpc/engine/EngineGrpc.scala diff --git a/core/src/main/scala/besom/rpc/pulumirpc/engine/EngineProto.scala b/besom-rpc/src/main/scala/pulumirpc/engine/EngineProto.scala similarity index 96% rename from core/src/main/scala/besom/rpc/pulumirpc/engine/EngineProto.scala rename to besom-rpc/src/main/scala/pulumirpc/engine/EngineProto.scala index 39353fd9..50d33e3e 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/engine/EngineProto.scala +++ b/besom-rpc/src/main/scala/pulumirpc/engine/EngineProto.scala @@ -9,8 +9,8 @@ object EngineProto extends _root_.scalapb.GeneratedFileObject { lazy val dependencies: Seq[_root_.scalapb.GeneratedFileObject] = Seq( com.google.protobuf.empty.EmptyProto ) - lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( pulumirpc.engine.LogRequest, pulumirpc.engine.GetRootResourceRequest, pulumirpc.engine.GetRootResourceResponse, diff --git a/core/src/main/scala/besom/rpc/pulumirpc/engine/GetRootResourceRequest.scala b/besom-rpc/src/main/scala/pulumirpc/engine/GetRootResourceRequest.scala similarity index 90% rename from core/src/main/scala/besom/rpc/pulumirpc/engine/GetRootResourceRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/engine/GetRootResourceRequest.scala index 2247c48a..395a2aec 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/engine/GetRootResourceRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/engine/GetRootResourceRequest.scala @@ -12,8 +12,8 @@ final case class GetRootResourceRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GetRootResourceRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 __size += unknownFields.serializedSize __size @@ -68,12 +68,12 @@ object GetRootResourceRequest extends scalapb.GeneratedMessageCompanion[pulumirp } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = EngineProto.javaDescriptor.getMessageTypes().get(1) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = EngineProto.scalaDescriptor.messages(1) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.engine.GetRootResourceRequest( ) - implicit class GetRootResourceRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.engine.GetRootResourceRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.engine.GetRootResourceRequest](_l) { + implicit class GetRootResourceRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.engine.GetRootResourceRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.engine.GetRootResourceRequest](_l) { } def of( ): _root_.pulumirpc.engine.GetRootResourceRequest = _root_.pulumirpc.engine.GetRootResourceRequest( diff --git a/core/src/main/scala/besom/rpc/pulumirpc/engine/GetRootResourceResponse.scala b/besom-rpc/src/main/scala/pulumirpc/engine/GetRootResourceResponse.scala similarity index 92% rename from core/src/main/scala/besom/rpc/pulumirpc/engine/GetRootResourceResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/engine/GetRootResourceResponse.scala index 89ad0e05..20ccf01d 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/engine/GetRootResourceResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/engine/GetRootResourceResponse.scala @@ -14,8 +14,8 @@ final case class GetRootResourceResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GetRootResourceResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -101,13 +101,13 @@ object GetRootResourceResponse extends scalapb.GeneratedMessageCompanion[pulumir } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = EngineProto.javaDescriptor.getMessageTypes().get(2) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = EngineProto.scalaDescriptor.messages(2) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.engine.GetRootResourceResponse( urn = "" ) - implicit class GetRootResourceResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.engine.GetRootResourceResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.engine.GetRootResourceResponse](_l) { + implicit class GetRootResourceResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.engine.GetRootResourceResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.engine.GetRootResourceResponse](_l) { def urn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.urn)((c_, f_) => c_.copy(urn = f_)) } final val URN_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/engine/LogRequest.scala b/besom-rpc/src/main/scala/pulumirpc/engine/LogRequest.scala similarity index 96% rename from core/src/main/scala/besom/rpc/pulumirpc/engine/LogRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/engine/LogRequest.scala index c0be9beb..d8fca8a0 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/engine/LogRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/engine/LogRequest.scala @@ -32,8 +32,8 @@ final case class LogRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[LogRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -215,9 +215,9 @@ object LogRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.engine.Log } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = EngineProto.javaDescriptor.getMessageTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = EngineProto.scalaDescriptor.messages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = { + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = { (__fieldNumber: @_root_.scala.unchecked) match { case 1 => pulumirpc.engine.LogSeverity } @@ -229,7 +229,7 @@ object LogRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.engine.Log streamId = 0, ephemeral = false ) - implicit class LogRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.engine.LogRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.engine.LogRequest](_l) { + implicit class LogRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.engine.LogRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.engine.LogRequest](_l) { def severity: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.engine.LogSeverity] = field(_.severity)((c_, f_) => c_.copy(severity = f_)) def message: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.message)((c_, f_) => c_.copy(message = f_)) def urn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.urn)((c_, f_) => c_.copy(urn = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/engine/LogSeverity.scala b/besom-rpc/src/main/scala/pulumirpc/engine/LogSeverity.scala similarity index 100% rename from core/src/main/scala/besom/rpc/pulumirpc/engine/LogSeverity.scala rename to besom-rpc/src/main/scala/pulumirpc/engine/LogSeverity.scala diff --git a/core/src/main/scala/besom/rpc/pulumirpc/engine/SetRootResourceRequest.scala b/besom-rpc/src/main/scala/pulumirpc/engine/SetRootResourceRequest.scala similarity index 92% rename from core/src/main/scala/besom/rpc/pulumirpc/engine/SetRootResourceRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/engine/SetRootResourceRequest.scala index 3db0b2ee..e40ecca6 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/engine/SetRootResourceRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/engine/SetRootResourceRequest.scala @@ -14,8 +14,8 @@ final case class SetRootResourceRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[SetRootResourceRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -101,13 +101,13 @@ object SetRootResourceRequest extends scalapb.GeneratedMessageCompanion[pulumirp } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = EngineProto.javaDescriptor.getMessageTypes().get(3) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = EngineProto.scalaDescriptor.messages(3) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.engine.SetRootResourceRequest( urn = "" ) - implicit class SetRootResourceRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.engine.SetRootResourceRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.engine.SetRootResourceRequest](_l) { + implicit class SetRootResourceRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.engine.SetRootResourceRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.engine.SetRootResourceRequest](_l) { def urn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.urn)((c_, f_) => c_.copy(urn = f_)) } final val URN_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/engine/SetRootResourceResponse.scala b/besom-rpc/src/main/scala/pulumirpc/engine/SetRootResourceResponse.scala similarity index 89% rename from core/src/main/scala/besom/rpc/pulumirpc/engine/SetRootResourceResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/engine/SetRootResourceResponse.scala index 2c097e73..2f74b695 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/engine/SetRootResourceResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/engine/SetRootResourceResponse.scala @@ -12,8 +12,8 @@ final case class SetRootResourceResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[SetRootResourceResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 __size += unknownFields.serializedSize __size @@ -68,12 +68,12 @@ object SetRootResourceResponse extends scalapb.GeneratedMessageCompanion[pulumir } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = EngineProto.javaDescriptor.getMessageTypes().get(4) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = EngineProto.scalaDescriptor.messages(4) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.engine.SetRootResourceResponse( ) - implicit class SetRootResourceResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.engine.SetRootResourceResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.engine.SetRootResourceResponse](_l) { + implicit class SetRootResourceResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.engine.SetRootResourceResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.engine.SetRootResourceResponse](_l) { } def of( ): _root_.pulumirpc.engine.SetRootResourceResponse = _root_.pulumirpc.engine.SetRootResourceResponse( diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/AboutResponse.scala b/besom-rpc/src/main/scala/pulumirpc/language/AboutResponse.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/language/AboutResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/language/AboutResponse.scala index 7f521561..4cbac4c0 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/AboutResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/AboutResponse.scala @@ -22,8 +22,8 @@ final case class AboutResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[AboutResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -154,18 +154,18 @@ object AboutResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.languag } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(1) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(1) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 3 => __out = pulumirpc.language.AboutResponse.MetadataEntry } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.language.AboutResponse.MetadataEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.AboutResponse( executable = "", version = "", @@ -178,8 +178,8 @@ object AboutResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.languag unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[MetadataEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -289,14 +289,14 @@ object AboutResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.languag } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.language.AboutResponse.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.language.AboutResponse.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.AboutResponse.MetadataEntry( key = "", value = "" ) - implicit class MetadataEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.AboutResponse.MetadataEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.AboutResponse.MetadataEntry](_l) { + implicit class MetadataEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.AboutResponse.MetadataEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.AboutResponse.MetadataEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -315,7 +315,7 @@ object AboutResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.languag // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.AboutResponse.MetadataEntry]) } - implicit class AboutResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.AboutResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.AboutResponse](_l) { + implicit class AboutResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.AboutResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.AboutResponse](_l) { def executable: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.executable)((c_, f_) => c_.copy(executable = f_)) def version: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.version)((c_, f_) => c_.copy(version = f_)) def metadata: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, _root_.scala.Predef.String]] = field(_.metadata)((c_, f_) => c_.copy(metadata = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/DependencyInfo.scala b/besom-rpc/src/main/scala/pulumirpc/language/DependencyInfo.scala similarity index 93% rename from core/src/main/scala/besom/rpc/pulumirpc/language/DependencyInfo.scala rename to besom-rpc/src/main/scala/pulumirpc/language/DependencyInfo.scala index 76f554d0..4f4e1381 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/DependencyInfo.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/DependencyInfo.scala @@ -17,8 +17,8 @@ final case class DependencyInfo( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[DependencyInfo] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -128,14 +128,14 @@ object DependencyInfo extends scalapb.GeneratedMessageCompanion[pulumirpc.langua } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(3) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(3) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.DependencyInfo( name = "", version = "" ) - implicit class DependencyInfoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.DependencyInfo]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.DependencyInfo](_l) { + implicit class DependencyInfoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.DependencyInfo]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.DependencyInfo](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def version: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.version)((c_, f_) => c_.copy(version = f_)) } diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/GeneratePackageRequest.scala b/besom-rpc/src/main/scala/pulumirpc/language/GeneratePackageRequest.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/language/GeneratePackageRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/language/GeneratePackageRequest.scala index ec509821..aa0b3aa2 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/GeneratePackageRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/GeneratePackageRequest.scala @@ -27,8 +27,8 @@ final case class GeneratePackageRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GeneratePackageRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -204,20 +204,20 @@ object GeneratePackageRequest extends scalapb.GeneratedMessageCompanion[pulumirp } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(17) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(17) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 3 => __out = pulumirpc.language.GeneratePackageRequest.ExtraFilesEntry case 5 => __out = pulumirpc.language.GeneratePackageRequest.LocalDependenciesEntry } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.language.GeneratePackageRequest.ExtraFilesEntry, _root_.pulumirpc.language.GeneratePackageRequest.LocalDependenciesEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.GeneratePackageRequest( directory = "", schema = "", @@ -232,8 +232,8 @@ object GeneratePackageRequest extends scalapb.GeneratedMessageCompanion[pulumirp unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ExtraFilesEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -343,14 +343,14 @@ object GeneratePackageRequest extends scalapb.GeneratedMessageCompanion[pulumirp } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.language.GeneratePackageRequest.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.language.GeneratePackageRequest.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.GeneratePackageRequest.ExtraFilesEntry( key = "", value = _root_.com.google.protobuf.ByteString.EMPTY ) - implicit class ExtraFilesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GeneratePackageRequest.ExtraFilesEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.GeneratePackageRequest.ExtraFilesEntry](_l) { + implicit class ExtraFilesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GeneratePackageRequest.ExtraFilesEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.GeneratePackageRequest.ExtraFilesEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -376,8 +376,8 @@ object GeneratePackageRequest extends scalapb.GeneratedMessageCompanion[pulumirp unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[LocalDependenciesEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -487,14 +487,14 @@ object GeneratePackageRequest extends scalapb.GeneratedMessageCompanion[pulumirp } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.language.GeneratePackageRequest.javaDescriptor.getNestedTypes().get(1) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.language.GeneratePackageRequest.scalaDescriptor.nestedMessages(1) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.GeneratePackageRequest.LocalDependenciesEntry( key = "", value = "" ) - implicit class LocalDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GeneratePackageRequest.LocalDependenciesEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.GeneratePackageRequest.LocalDependenciesEntry](_l) { + implicit class LocalDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GeneratePackageRequest.LocalDependenciesEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.GeneratePackageRequest.LocalDependenciesEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -513,7 +513,7 @@ object GeneratePackageRequest extends scalapb.GeneratedMessageCompanion[pulumirp // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.GeneratePackageRequest.LocalDependenciesEntry]) } - implicit class GeneratePackageRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GeneratePackageRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.GeneratePackageRequest](_l) { + implicit class GeneratePackageRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GeneratePackageRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.GeneratePackageRequest](_l) { def directory: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.directory)((c_, f_) => c_.copy(directory = f_)) def schema: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.schema)((c_, f_) => c_.copy(schema = f_)) def extraFiles: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, _root_.com.google.protobuf.ByteString]] = field(_.extraFiles)((c_, f_) => c_.copy(extraFiles = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/GeneratePackageResponse.scala b/besom-rpc/src/main/scala/pulumirpc/language/GeneratePackageResponse.scala similarity index 92% rename from core/src/main/scala/besom/rpc/pulumirpc/language/GeneratePackageResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/language/GeneratePackageResponse.scala index edf5ce9c..f98a795a 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/GeneratePackageResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/GeneratePackageResponse.scala @@ -14,8 +14,8 @@ final case class GeneratePackageResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GeneratePackageResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 diagnostics.foreach { __item => val __value = __item @@ -98,19 +98,19 @@ object GeneratePackageResponse extends scalapb.GeneratedMessageCompanion[pulumir } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(18) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(18) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 1 => __out = pulumirpc.codegen.hcl.Diagnostic } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.GeneratePackageResponse( diagnostics = _root_.scala.Seq.empty ) - implicit class GeneratePackageResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GeneratePackageResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.GeneratePackageResponse](_l) { + implicit class GeneratePackageResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GeneratePackageResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.GeneratePackageResponse](_l) { def diagnostics: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[pulumirpc.codegen.hcl.Diagnostic]] = field(_.diagnostics)((c_, f_) => c_.copy(diagnostics = f_)) } final val DIAGNOSTICS_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/GenerateProgramRequest.scala b/besom-rpc/src/main/scala/pulumirpc/language/GenerateProgramRequest.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/language/GenerateProgramRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/language/GenerateProgramRequest.scala index f7f5ee8c..6286d646 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/GenerateProgramRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/GenerateProgramRequest.scala @@ -17,8 +17,8 @@ final case class GenerateProgramRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GenerateProgramRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 source.foreach { __item => val __value = pulumirpc.language.GenerateProgramRequest._typemapper_source.toBase(__item) @@ -125,18 +125,18 @@ object GenerateProgramRequest extends scalapb.GeneratedMessageCompanion[pulumirp } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(13) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(13) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 1 => __out = pulumirpc.language.GenerateProgramRequest.SourceEntry } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.language.GenerateProgramRequest.SourceEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.GenerateProgramRequest( source = _root_.scala.collection.immutable.Map.empty, loaderTarget = "" @@ -148,8 +148,8 @@ object GenerateProgramRequest extends scalapb.GeneratedMessageCompanion[pulumirp unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[SourceEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -259,14 +259,14 @@ object GenerateProgramRequest extends scalapb.GeneratedMessageCompanion[pulumirp } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.language.GenerateProgramRequest.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.language.GenerateProgramRequest.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.GenerateProgramRequest.SourceEntry( key = "", value = "" ) - implicit class SourceEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GenerateProgramRequest.SourceEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.GenerateProgramRequest.SourceEntry](_l) { + implicit class SourceEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GenerateProgramRequest.SourceEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.GenerateProgramRequest.SourceEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -285,7 +285,7 @@ object GenerateProgramRequest extends scalapb.GeneratedMessageCompanion[pulumirp // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.GenerateProgramRequest.SourceEntry]) } - implicit class GenerateProgramRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GenerateProgramRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.GenerateProgramRequest](_l) { + implicit class GenerateProgramRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GenerateProgramRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.GenerateProgramRequest](_l) { def source: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, _root_.scala.Predef.String]] = field(_.source)((c_, f_) => c_.copy(source = f_)) def loaderTarget: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.loaderTarget)((c_, f_) => c_.copy(loaderTarget = f_)) } diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/GenerateProgramResponse.scala b/besom-rpc/src/main/scala/pulumirpc/language/GenerateProgramResponse.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/language/GenerateProgramResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/language/GenerateProgramResponse.scala index f32fa233..624e4525 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/GenerateProgramResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/GenerateProgramResponse.scala @@ -17,8 +17,8 @@ final case class GenerateProgramResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GenerateProgramResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 diagnostics.foreach { __item => val __value = __item @@ -122,19 +122,19 @@ object GenerateProgramResponse extends scalapb.GeneratedMessageCompanion[pulumir } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(14) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(14) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 1 => __out = pulumirpc.codegen.hcl.Diagnostic case 2 => __out = pulumirpc.language.GenerateProgramResponse.SourceEntry } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.language.GenerateProgramResponse.SourceEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.GenerateProgramResponse( diagnostics = _root_.scala.Seq.empty, source = _root_.scala.collection.immutable.Map.empty @@ -146,8 +146,8 @@ object GenerateProgramResponse extends scalapb.GeneratedMessageCompanion[pulumir unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[SourceEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -257,14 +257,14 @@ object GenerateProgramResponse extends scalapb.GeneratedMessageCompanion[pulumir } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.language.GenerateProgramResponse.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.language.GenerateProgramResponse.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.GenerateProgramResponse.SourceEntry( key = "", value = _root_.com.google.protobuf.ByteString.EMPTY ) - implicit class SourceEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GenerateProgramResponse.SourceEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.GenerateProgramResponse.SourceEntry](_l) { + implicit class SourceEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GenerateProgramResponse.SourceEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.GenerateProgramResponse.SourceEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -283,7 +283,7 @@ object GenerateProgramResponse extends scalapb.GeneratedMessageCompanion[pulumir // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.GenerateProgramResponse.SourceEntry]) } - implicit class GenerateProgramResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GenerateProgramResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.GenerateProgramResponse](_l) { + implicit class GenerateProgramResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GenerateProgramResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.GenerateProgramResponse](_l) { def diagnostics: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[pulumirpc.codegen.hcl.Diagnostic]] = field(_.diagnostics)((c_, f_) => c_.copy(diagnostics = f_)) def source: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, _root_.com.google.protobuf.ByteString]] = field(_.source)((c_, f_) => c_.copy(source = f_)) } diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/GenerateProjectRequest.scala b/besom-rpc/src/main/scala/pulumirpc/language/GenerateProjectRequest.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/language/GenerateProjectRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/language/GenerateProjectRequest.scala index f75bbb2e..40751427 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/GenerateProjectRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/GenerateProjectRequest.scala @@ -30,8 +30,8 @@ final case class GenerateProjectRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GenerateProjectRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -234,18 +234,18 @@ object GenerateProjectRequest extends scalapb.GeneratedMessageCompanion[pulumirp } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(15) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(15) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 6 => __out = pulumirpc.language.GenerateProjectRequest.LocalDependenciesEntry } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.language.GenerateProjectRequest.LocalDependenciesEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.GenerateProjectRequest( sourceDirectory = "", targetDirectory = "", @@ -261,8 +261,8 @@ object GenerateProjectRequest extends scalapb.GeneratedMessageCompanion[pulumirp unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[LocalDependenciesEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -372,14 +372,14 @@ object GenerateProjectRequest extends scalapb.GeneratedMessageCompanion[pulumirp } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.language.GenerateProjectRequest.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.language.GenerateProjectRequest.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.GenerateProjectRequest.LocalDependenciesEntry( key = "", value = "" ) - implicit class LocalDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GenerateProjectRequest.LocalDependenciesEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.GenerateProjectRequest.LocalDependenciesEntry](_l) { + implicit class LocalDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GenerateProjectRequest.LocalDependenciesEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.GenerateProjectRequest.LocalDependenciesEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -398,7 +398,7 @@ object GenerateProjectRequest extends scalapb.GeneratedMessageCompanion[pulumirp // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.GenerateProjectRequest.LocalDependenciesEntry]) } - implicit class GenerateProjectRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GenerateProjectRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.GenerateProjectRequest](_l) { + implicit class GenerateProjectRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GenerateProjectRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.GenerateProjectRequest](_l) { def sourceDirectory: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.sourceDirectory)((c_, f_) => c_.copy(sourceDirectory = f_)) def targetDirectory: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.targetDirectory)((c_, f_) => c_.copy(targetDirectory = f_)) def project: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.project)((c_, f_) => c_.copy(project = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/GenerateProjectResponse.scala b/besom-rpc/src/main/scala/pulumirpc/language/GenerateProjectResponse.scala similarity index 92% rename from core/src/main/scala/besom/rpc/pulumirpc/language/GenerateProjectResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/language/GenerateProjectResponse.scala index 18f3379a..d4da174b 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/GenerateProjectResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/GenerateProjectResponse.scala @@ -14,8 +14,8 @@ final case class GenerateProjectResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GenerateProjectResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 diagnostics.foreach { __item => val __value = __item @@ -98,19 +98,19 @@ object GenerateProjectResponse extends scalapb.GeneratedMessageCompanion[pulumir } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(16) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(16) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 1 => __out = pulumirpc.codegen.hcl.Diagnostic } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.GenerateProjectResponse( diagnostics = _root_.scala.Seq.empty ) - implicit class GenerateProjectResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GenerateProjectResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.GenerateProjectResponse](_l) { + implicit class GenerateProjectResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GenerateProjectResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.GenerateProjectResponse](_l) { def diagnostics: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[pulumirpc.codegen.hcl.Diagnostic]] = field(_.diagnostics)((c_, f_) => c_.copy(diagnostics = f_)) } final val DIAGNOSTICS_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/GetProgramDependenciesRequest.scala b/besom-rpc/src/main/scala/pulumirpc/language/GetProgramDependenciesRequest.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/language/GetProgramDependenciesRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/language/GetProgramDependenciesRequest.scala index 2b993bca..8af3cf43 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/GetProgramDependenciesRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/GetProgramDependenciesRequest.scala @@ -26,8 +26,8 @@ final case class GetProgramDependenciesRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GetProgramDependenciesRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -205,15 +205,15 @@ object GetProgramDependenciesRequest extends scalapb.GeneratedMessageCompanion[p } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(2) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(2) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 5 => __out = pulumirpc.language.ProgramInfo } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.GetProgramDependenciesRequest( project = "", pwd = "", @@ -221,7 +221,7 @@ object GetProgramDependenciesRequest extends scalapb.GeneratedMessageCompanion[p transitiveDependencies = false, info = _root_.scala.None ) - implicit class GetProgramDependenciesRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GetProgramDependenciesRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.GetProgramDependenciesRequest](_l) { + implicit class GetProgramDependenciesRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GetProgramDependenciesRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.GetProgramDependenciesRequest](_l) { def project: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.project)((c_, f_) => c_.copy(project = f_)) def pwd: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.pwd)((c_, f_) => c_.copy(pwd = f_)) def program: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.program)((c_, f_) => c_.copy(program = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/GetProgramDependenciesResponse.scala b/besom-rpc/src/main/scala/pulumirpc/language/GetProgramDependenciesResponse.scala similarity index 92% rename from core/src/main/scala/besom/rpc/pulumirpc/language/GetProgramDependenciesResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/language/GetProgramDependenciesResponse.scala index bd64391e..fc0a7617 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/GetProgramDependenciesResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/GetProgramDependenciesResponse.scala @@ -14,8 +14,8 @@ final case class GetProgramDependenciesResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GetProgramDependenciesResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 dependencies.foreach { __item => val __value = __item @@ -98,19 +98,19 @@ object GetProgramDependenciesResponse extends scalapb.GeneratedMessageCompanion[ } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(4) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(4) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 1 => __out = pulumirpc.language.DependencyInfo } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.GetProgramDependenciesResponse( dependencies = _root_.scala.Seq.empty ) - implicit class GetProgramDependenciesResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GetProgramDependenciesResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.GetProgramDependenciesResponse](_l) { + implicit class GetProgramDependenciesResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GetProgramDependenciesResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.GetProgramDependenciesResponse](_l) { def dependencies: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[pulumirpc.language.DependencyInfo]] = field(_.dependencies)((c_, f_) => c_.copy(dependencies = f_)) } final val DEPENDENCIES_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/GetRequiredPluginsRequest.scala b/besom-rpc/src/main/scala/pulumirpc/language/GetRequiredPluginsRequest.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/language/GetRequiredPluginsRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/language/GetRequiredPluginsRequest.scala index da6aa4b0..6012498e 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/GetRequiredPluginsRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/GetRequiredPluginsRequest.scala @@ -23,8 +23,8 @@ final case class GetRequiredPluginsRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GetRequiredPluginsRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -178,22 +178,22 @@ object GetRequiredPluginsRequest extends scalapb.GeneratedMessageCompanion[pulum } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(5) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(5) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 4 => __out = pulumirpc.language.ProgramInfo } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.GetRequiredPluginsRequest( project = "", pwd = "", program = "", info = _root_.scala.None ) - implicit class GetRequiredPluginsRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GetRequiredPluginsRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.GetRequiredPluginsRequest](_l) { + implicit class GetRequiredPluginsRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GetRequiredPluginsRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.GetRequiredPluginsRequest](_l) { def project: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.project)((c_, f_) => c_.copy(project = f_)) def pwd: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.pwd)((c_, f_) => c_.copy(pwd = f_)) def program: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.program)((c_, f_) => c_.copy(program = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/GetRequiredPluginsResponse.scala b/besom-rpc/src/main/scala/pulumirpc/language/GetRequiredPluginsResponse.scala similarity index 92% rename from core/src/main/scala/besom/rpc/pulumirpc/language/GetRequiredPluginsResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/language/GetRequiredPluginsResponse.scala index 6b40506f..03ef3397 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/GetRequiredPluginsResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/GetRequiredPluginsResponse.scala @@ -14,8 +14,8 @@ final case class GetRequiredPluginsResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GetRequiredPluginsResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 plugins.foreach { __item => val __value = __item @@ -98,19 +98,19 @@ object GetRequiredPluginsResponse extends scalapb.GeneratedMessageCompanion[pulu } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(6) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(6) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 1 => __out = pulumirpc.plugin.PluginDependency } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.GetRequiredPluginsResponse( plugins = _root_.scala.Seq.empty ) - implicit class GetRequiredPluginsResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GetRequiredPluginsResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.GetRequiredPluginsResponse](_l) { + implicit class GetRequiredPluginsResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.GetRequiredPluginsResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.GetRequiredPluginsResponse](_l) { def plugins: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[pulumirpc.plugin.PluginDependency]] = field(_.plugins)((c_, f_) => c_.copy(plugins = f_)) } final val PLUGINS_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/InstallDependenciesRequest.scala b/besom-rpc/src/main/scala/pulumirpc/language/InstallDependenciesRequest.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/language/InstallDependenciesRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/language/InstallDependenciesRequest.scala index f3e064ee..d5b95473 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/InstallDependenciesRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/InstallDependenciesRequest.scala @@ -20,8 +20,8 @@ final case class InstallDependenciesRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[InstallDependenciesRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -151,21 +151,21 @@ object InstallDependenciesRequest extends scalapb.GeneratedMessageCompanion[pulu } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(9) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(9) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 3 => __out = pulumirpc.language.ProgramInfo } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.InstallDependenciesRequest( directory = "", isTerminal = false, info = _root_.scala.None ) - implicit class InstallDependenciesRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.InstallDependenciesRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.InstallDependenciesRequest](_l) { + implicit class InstallDependenciesRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.InstallDependenciesRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.InstallDependenciesRequest](_l) { def directory: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.directory)((c_, f_) => c_.copy(directory = f_)) def isTerminal: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.isTerminal)((c_, f_) => c_.copy(isTerminal = f_)) def info: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.ProgramInfo] = field(_.getInfo)((c_, f_) => c_.copy(info = _root_.scala.Option(f_))) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/InstallDependenciesResponse.scala b/besom-rpc/src/main/scala/pulumirpc/language/InstallDependenciesResponse.scala similarity index 93% rename from core/src/main/scala/besom/rpc/pulumirpc/language/InstallDependenciesResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/language/InstallDependenciesResponse.scala index 8e5fae91..911b072b 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/InstallDependenciesResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/InstallDependenciesResponse.scala @@ -17,8 +17,8 @@ final case class InstallDependenciesResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[InstallDependenciesResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -128,14 +128,14 @@ object InstallDependenciesResponse extends scalapb.GeneratedMessageCompanion[pul } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(10) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(10) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.InstallDependenciesResponse( stdout = _root_.com.google.protobuf.ByteString.EMPTY, stderr = _root_.com.google.protobuf.ByteString.EMPTY ) - implicit class InstallDependenciesResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.InstallDependenciesResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.InstallDependenciesResponse](_l) { + implicit class InstallDependenciesResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.InstallDependenciesResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.InstallDependenciesResponse](_l) { def stdout: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.stdout)((c_, f_) => c_.copy(stdout = f_)) def stderr: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.stderr)((c_, f_) => c_.copy(stderr = f_)) } diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/LanguageProto.scala b/besom-rpc/src/main/scala/pulumirpc/language/LanguageProto.scala similarity index 98% rename from core/src/main/scala/besom/rpc/pulumirpc/language/LanguageProto.scala rename to besom-rpc/src/main/scala/pulumirpc/language/LanguageProto.scala index 5d681798..8424b358 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/LanguageProto.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/LanguageProto.scala @@ -12,8 +12,8 @@ object LanguageProto extends _root_.scalapb.GeneratedFileObject { com.google.protobuf.empty.EmptyProto, com.google.protobuf.struct.StructProto ) - lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( pulumirpc.language.ProgramInfo, pulumirpc.language.AboutResponse, pulumirpc.language.GetProgramDependenciesRequest, diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/LanguageRuntimeGrpc.scala b/besom-rpc/src/main/scala/pulumirpc/language/LanguageRuntimeGrpc.scala similarity index 100% rename from core/src/main/scala/besom/rpc/pulumirpc/language/LanguageRuntimeGrpc.scala rename to besom-rpc/src/main/scala/pulumirpc/language/LanguageRuntimeGrpc.scala diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/PackRequest.scala b/besom-rpc/src/main/scala/pulumirpc/language/PackRequest.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/language/PackRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/language/PackRequest.scala index 60aaf839..f45622d4 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/PackRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/PackRequest.scala @@ -17,8 +17,8 @@ final case class PackRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PackRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -128,14 +128,14 @@ object PackRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.language. } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(19) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(19) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.PackRequest( packageDirectory = "", destinationDirectory = "" ) - implicit class PackRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.PackRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.PackRequest](_l) { + implicit class PackRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.PackRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.PackRequest](_l) { def packageDirectory: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.packageDirectory)((c_, f_) => c_.copy(packageDirectory = f_)) def destinationDirectory: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.destinationDirectory)((c_, f_) => c_.copy(destinationDirectory = f_)) } diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/PackResponse.scala b/besom-rpc/src/main/scala/pulumirpc/language/PackResponse.scala similarity index 92% rename from core/src/main/scala/besom/rpc/pulumirpc/language/PackResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/language/PackResponse.scala index 48d47ec1..eb3738af 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/PackResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/PackResponse.scala @@ -14,8 +14,8 @@ final case class PackResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PackResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -101,13 +101,13 @@ object PackResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.language } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(20) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(20) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.PackResponse( artifactPath = "" ) - implicit class PackResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.PackResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.PackResponse](_l) { + implicit class PackResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.PackResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.PackResponse](_l) { def artifactPath: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.artifactPath)((c_, f_) => c_.copy(artifactPath = f_)) } final val ARTIFACT_PATH_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/ProgramInfo.scala b/besom-rpc/src/main/scala/pulumirpc/language/ProgramInfo.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/language/ProgramInfo.scala rename to besom-rpc/src/main/scala/pulumirpc/language/ProgramInfo.scala index ae0bf047..e9d580a0 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/ProgramInfo.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/ProgramInfo.scala @@ -30,8 +30,8 @@ final case class ProgramInfo( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ProgramInfo] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -185,22 +185,22 @@ object ProgramInfo extends scalapb.GeneratedMessageCompanion[pulumirpc.language. } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 4 => __out = com.google.protobuf.struct.Struct } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.ProgramInfo( rootDirectory = "", programDirectory = "", entryPoint = "", options = _root_.scala.None ) - implicit class ProgramInfoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.ProgramInfo]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.ProgramInfo](_l) { + implicit class ProgramInfoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.ProgramInfo]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.ProgramInfo](_l) { def rootDirectory: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.rootDirectory)((c_, f_) => c_.copy(rootDirectory = f_)) def programDirectory: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.programDirectory)((c_, f_) => c_.copy(programDirectory = f_)) def entryPoint: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.entryPoint)((c_, f_) => c_.copy(entryPoint = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/RunPluginRequest.scala b/besom-rpc/src/main/scala/pulumirpc/language/RunPluginRequest.scala similarity index 96% rename from core/src/main/scala/besom/rpc/pulumirpc/language/RunPluginRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/language/RunPluginRequest.scala index 7a8b24e4..666187cb 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/RunPluginRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/RunPluginRequest.scala @@ -26,8 +26,8 @@ final case class RunPluginRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[RunPluginRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -195,15 +195,15 @@ object RunPluginRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.lang } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(11) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(11) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 5 => __out = pulumirpc.language.ProgramInfo } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.RunPluginRequest( pwd = "", program = "", @@ -211,7 +211,7 @@ object RunPluginRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.lang env = _root_.scala.Seq.empty, info = _root_.scala.None ) - implicit class RunPluginRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.RunPluginRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.RunPluginRequest](_l) { + implicit class RunPluginRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.RunPluginRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.RunPluginRequest](_l) { def pwd: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.pwd)((c_, f_) => c_.copy(pwd = f_)) def program: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.program)((c_, f_) => c_.copy(program = f_)) def args: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.args)((c_, f_) => c_.copy(args = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/RunPluginResponse.scala b/besom-rpc/src/main/scala/pulumirpc/language/RunPluginResponse.scala similarity index 96% rename from core/src/main/scala/besom/rpc/pulumirpc/language/RunPluginResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/language/RunPluginResponse.scala index e2b08705..0f4abda6 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/RunPluginResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/RunPluginResponse.scala @@ -11,8 +11,8 @@ final case class RunPluginResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[RunPluginResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 if (output.stdout.isDefined) { val __value = output.stdout.get @@ -124,9 +124,9 @@ object RunPluginResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.lan } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(12) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(12) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.RunPluginResponse( output = pulumirpc.language.RunPluginResponse.Output.Empty ) @@ -172,7 +172,7 @@ object RunPluginResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.lan override def number: _root_.scala.Int = 3 } } - implicit class RunPluginResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.RunPluginResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.RunPluginResponse](_l) { + implicit class RunPluginResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.RunPluginResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.RunPluginResponse](_l) { def stdout: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.getStdout)((c_, f_) => c_.copy(output = pulumirpc.language.RunPluginResponse.Output.Stdout(f_))) def stderr: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.getStderr)((c_, f_) => c_.copy(output = pulumirpc.language.RunPluginResponse.Output.Stderr(f_))) def exitcode: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.getExitcode)((c_, f_) => c_.copy(output = pulumirpc.language.RunPluginResponse.Output.Exitcode(f_))) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/RunRequest.scala b/besom-rpc/src/main/scala/pulumirpc/language/RunRequest.scala similarity index 97% rename from core/src/main/scala/besom/rpc/pulumirpc/language/RunRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/language/RunRequest.scala index 911e7a35..e86dad57 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/RunRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/RunRequest.scala @@ -55,8 +55,8 @@ final case class RunRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[RunRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -433,8 +433,8 @@ object RunRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.language.R } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(7) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(7) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 6 => __out = pulumirpc.language.RunRequest.ConfigEntry case 13 => __out = com.google.protobuf.struct.Struct @@ -442,11 +442,11 @@ object RunRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.language.R } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.language.RunRequest.ConfigEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.RunRequest( project = "", stack = "", @@ -470,8 +470,8 @@ object RunRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.language.R unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ConfigEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -581,14 +581,14 @@ object RunRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.language.R } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.language.RunRequest.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.language.RunRequest.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.RunRequest.ConfigEntry( key = "", value = "" ) - implicit class ConfigEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.RunRequest.ConfigEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.RunRequest.ConfigEntry](_l) { + implicit class ConfigEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.RunRequest.ConfigEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.RunRequest.ConfigEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -607,7 +607,7 @@ object RunRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.language.R // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.RunRequest.ConfigEntry]) } - implicit class RunRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.RunRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.RunRequest](_l) { + implicit class RunRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.RunRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.RunRequest](_l) { def project: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.project)((c_, f_) => c_.copy(project = f_)) def stack: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.stack)((c_, f_) => c_.copy(stack = f_)) def pwd: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.pwd)((c_, f_) => c_.copy(pwd = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/language/RunResponse.scala b/besom-rpc/src/main/scala/pulumirpc/language/RunResponse.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/language/RunResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/language/RunResponse.scala index aef6fbed..76689411 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/language/RunResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/language/RunResponse.scala @@ -21,8 +21,8 @@ final case class RunResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[RunResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -132,14 +132,14 @@ object RunResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.language. } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = LanguageProto.javaDescriptor.getMessageTypes().get(8) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = LanguageProto.scalaDescriptor.messages(8) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.language.RunResponse( error = "", bail = false ) - implicit class RunResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.RunResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.language.RunResponse](_l) { + implicit class RunResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.language.RunResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.language.RunResponse](_l) { def error: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.error)((c_, f_) => c_.copy(error = f_)) def bail: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.bail)((c_, f_) => c_.copy(bail = f_)) } diff --git a/core/src/main/scala/besom/rpc/pulumirpc/plugin/PluginAttach.scala b/besom-rpc/src/main/scala/pulumirpc/plugin/PluginAttach.scala similarity index 93% rename from core/src/main/scala/besom/rpc/pulumirpc/plugin/PluginAttach.scala rename to besom-rpc/src/main/scala/pulumirpc/plugin/PluginAttach.scala index 79b3f64f..75d55f84 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/plugin/PluginAttach.scala +++ b/besom-rpc/src/main/scala/pulumirpc/plugin/PluginAttach.scala @@ -20,8 +20,8 @@ final case class PluginAttach( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PluginAttach] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -107,13 +107,13 @@ object PluginAttach extends scalapb.GeneratedMessageCompanion[pulumirpc.plugin.P } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = PluginProto.javaDescriptor.getMessageTypes().get(2) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = PluginProto.scalaDescriptor.messages(2) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.plugin.PluginAttach( address = "" ) - implicit class PluginAttachLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.plugin.PluginAttach]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.plugin.PluginAttach](_l) { + implicit class PluginAttachLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.plugin.PluginAttach]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.plugin.PluginAttach](_l) { def address: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.address)((c_, f_) => c_.copy(address = f_)) } final val ADDRESS_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/plugin/PluginDependency.scala b/besom-rpc/src/main/scala/pulumirpc/plugin/PluginDependency.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/plugin/PluginDependency.scala rename to besom-rpc/src/main/scala/pulumirpc/plugin/PluginDependency.scala index 33b3d67e..f23b91b9 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/plugin/PluginDependency.scala +++ b/besom-rpc/src/main/scala/pulumirpc/plugin/PluginDependency.scala @@ -29,8 +29,8 @@ final case class PluginDependency( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PluginDependency] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -209,18 +209,18 @@ object PluginDependency extends scalapb.GeneratedMessageCompanion[pulumirpc.plug } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = PluginProto.javaDescriptor.getMessageTypes().get(1) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = PluginProto.scalaDescriptor.messages(1) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 5 => __out = pulumirpc.plugin.PluginDependency.ChecksumsEntry } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.plugin.PluginDependency.ChecksumsEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.plugin.PluginDependency( name = "", kind = "", @@ -235,8 +235,8 @@ object PluginDependency extends scalapb.GeneratedMessageCompanion[pulumirpc.plug unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ChecksumsEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -346,14 +346,14 @@ object PluginDependency extends scalapb.GeneratedMessageCompanion[pulumirpc.plug } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.plugin.PluginDependency.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.plugin.PluginDependency.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.plugin.PluginDependency.ChecksumsEntry( key = "", value = _root_.com.google.protobuf.ByteString.EMPTY ) - implicit class ChecksumsEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.plugin.PluginDependency.ChecksumsEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.plugin.PluginDependency.ChecksumsEntry](_l) { + implicit class ChecksumsEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.plugin.PluginDependency.ChecksumsEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.plugin.PluginDependency.ChecksumsEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -372,7 +372,7 @@ object PluginDependency extends scalapb.GeneratedMessageCompanion[pulumirpc.plug // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.PluginDependency.ChecksumsEntry]) } - implicit class PluginDependencyLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.plugin.PluginDependency]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.plugin.PluginDependency](_l) { + implicit class PluginDependencyLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.plugin.PluginDependency]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.plugin.PluginDependency](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def kind: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.kind)((c_, f_) => c_.copy(kind = f_)) def version: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.version)((c_, f_) => c_.copy(version = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/plugin/PluginInfo.scala b/besom-rpc/src/main/scala/pulumirpc/plugin/PluginInfo.scala similarity index 92% rename from core/src/main/scala/besom/rpc/pulumirpc/plugin/PluginInfo.scala rename to besom-rpc/src/main/scala/pulumirpc/plugin/PluginInfo.scala index 490bc7e1..23f9e59b 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/plugin/PluginInfo.scala +++ b/besom-rpc/src/main/scala/pulumirpc/plugin/PluginInfo.scala @@ -16,8 +16,8 @@ final case class PluginInfo( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PluginInfo] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -103,13 +103,13 @@ object PluginInfo extends scalapb.GeneratedMessageCompanion[pulumirpc.plugin.Plu } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = PluginProto.javaDescriptor.getMessageTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = PluginProto.scalaDescriptor.messages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.plugin.PluginInfo( version = "" ) - implicit class PluginInfoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.plugin.PluginInfo]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.plugin.PluginInfo](_l) { + implicit class PluginInfoLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.plugin.PluginInfo]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.plugin.PluginInfo](_l) { def version: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.version)((c_, f_) => c_.copy(version = f_)) } final val VERSION_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/plugin/PluginProto.scala b/besom-rpc/src/main/scala/pulumirpc/plugin/PluginProto.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/plugin/PluginProto.scala rename to besom-rpc/src/main/scala/pulumirpc/plugin/PluginProto.scala index 8814f1e8..cb40512a 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/plugin/PluginProto.scala +++ b/besom-rpc/src/main/scala/pulumirpc/plugin/PluginProto.scala @@ -7,8 +7,8 @@ package pulumirpc.plugin object PluginProto extends _root_.scalapb.GeneratedFileObject { lazy val dependencies: Seq[_root_.scalapb.GeneratedFileObject] = Seq.empty - lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( pulumirpc.plugin.PluginInfo, pulumirpc.plugin.PluginDependency, pulumirpc.plugin.PluginAttach diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/CallRequest.scala b/besom-rpc/src/main/scala/pulumirpc/provider/CallRequest.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/CallRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/CallRequest.scala index 63cc99e8..5686866e 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/CallRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/CallRequest.scala @@ -47,8 +47,8 @@ final case class CallRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[CallRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -383,8 +383,8 @@ object CallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provider. } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(7) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(7) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = com.google.protobuf.struct.Struct case 3 => __out = pulumirpc.provider.CallRequest.ArgDependenciesEntry @@ -392,13 +392,13 @@ object CallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provider. } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.provider.CallRequest.ArgumentDependencies, _root_.pulumirpc.provider.CallRequest.ArgDependenciesEntry, _root_.pulumirpc.provider.CallRequest.ConfigEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.CallRequest( tok = "", args = _root_.scala.None, @@ -424,8 +424,8 @@ object CallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provider. unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ArgumentDependencies] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 urns.foreach { __item => val __value = __item @@ -506,13 +506,13 @@ object CallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provider. } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.provider.CallRequest.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.provider.CallRequest.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.CallRequest.ArgumentDependencies( urns = _root_.scala.Seq.empty ) - implicit class ArgumentDependenciesLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CallRequest.ArgumentDependencies]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.CallRequest.ArgumentDependencies](_l) { + implicit class ArgumentDependenciesLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CallRequest.ArgumentDependencies]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.CallRequest.ArgumentDependencies](_l) { def urns: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.urns)((c_, f_) => c_.copy(urns = f_)) } final val URNS_FIELD_NUMBER = 1 @@ -531,8 +531,8 @@ object CallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provider. unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ArgDependenciesEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -638,20 +638,20 @@ object CallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provider. } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.provider.CallRequest.javaDescriptor.getNestedTypes().get(1) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.provider.CallRequest.scalaDescriptor.nestedMessages(1) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = pulumirpc.provider.CallRequest.ArgumentDependencies } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.CallRequest.ArgDependenciesEntry( key = "", value = _root_.scala.None ) - implicit class ArgDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CallRequest.ArgDependenciesEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.CallRequest.ArgDependenciesEntry](_l) { + implicit class ArgDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CallRequest.ArgDependenciesEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.CallRequest.ArgDependenciesEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CallRequest.ArgumentDependencies] = field(_.getValue)((c_, f_) => c_.copy(value = _root_.scala.Option(f_))) def optionalValue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[pulumirpc.provider.CallRequest.ArgumentDependencies]] = field(_.value)((c_, f_) => c_.copy(value = f_)) @@ -678,8 +678,8 @@ object CallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provider. unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ConfigEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -789,14 +789,14 @@ object CallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provider. } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.provider.CallRequest.javaDescriptor.getNestedTypes().get(2) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.provider.CallRequest.scalaDescriptor.nestedMessages(2) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.CallRequest.ConfigEntry( key = "", value = "" ) - implicit class ConfigEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CallRequest.ConfigEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.CallRequest.ConfigEntry](_l) { + implicit class ConfigEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CallRequest.ConfigEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.CallRequest.ConfigEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -815,7 +815,7 @@ object CallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provider. // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.CallRequest.ConfigEntry]) } - implicit class CallRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CallRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.CallRequest](_l) { + implicit class CallRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CallRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.CallRequest](_l) { def tok: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.tok)((c_, f_) => c_.copy(tok = f_)) def args: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getArgs)((c_, f_) => c_.copy(args = _root_.scala.Option(f_))) def optionalArgs: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.args)((c_, f_) => c_.copy(args = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/CallResponse.scala b/besom-rpc/src/main/scala/pulumirpc/provider/CallResponse.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/CallResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/CallResponse.scala index 4e9b1f14..0410f6ad 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/CallResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/CallResponse.scala @@ -20,8 +20,8 @@ final case class CallResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[CallResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 if (`return`.isDefined) { val __value = `return`.get @@ -145,8 +145,8 @@ object CallResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.provider } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(8) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(8) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 1 => __out = com.google.protobuf.struct.Struct case 2 => __out = pulumirpc.provider.CallResponse.ReturnDependenciesEntry @@ -154,12 +154,12 @@ object CallResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.provider } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.provider.CallResponse.ReturnDependencies, _root_.pulumirpc.provider.CallResponse.ReturnDependenciesEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.CallResponse( `return` = _root_.scala.None, returnDependencies = _root_.scala.collection.immutable.Map.empty, @@ -176,8 +176,8 @@ object CallResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.provider unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ReturnDependencies] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 urns.foreach { __item => val __value = __item @@ -258,13 +258,13 @@ object CallResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.provider } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.provider.CallResponse.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.provider.CallResponse.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.CallResponse.ReturnDependencies( urns = _root_.scala.Seq.empty ) - implicit class ReturnDependenciesLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CallResponse.ReturnDependencies]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.CallResponse.ReturnDependencies](_l) { + implicit class ReturnDependenciesLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CallResponse.ReturnDependencies]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.CallResponse.ReturnDependencies](_l) { def urns: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.urns)((c_, f_) => c_.copy(urns = f_)) } final val URNS_FIELD_NUMBER = 1 @@ -283,8 +283,8 @@ object CallResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.provider unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ReturnDependenciesEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -390,20 +390,20 @@ object CallResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.provider } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.provider.CallResponse.javaDescriptor.getNestedTypes().get(1) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.provider.CallResponse.scalaDescriptor.nestedMessages(1) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = pulumirpc.provider.CallResponse.ReturnDependencies } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.CallResponse.ReturnDependenciesEntry( key = "", value = _root_.scala.None ) - implicit class ReturnDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CallResponse.ReturnDependenciesEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.CallResponse.ReturnDependenciesEntry](_l) { + implicit class ReturnDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CallResponse.ReturnDependenciesEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.CallResponse.ReturnDependenciesEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CallResponse.ReturnDependencies] = field(_.getValue)((c_, f_) => c_.copy(value = _root_.scala.Option(f_))) def optionalValue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[pulumirpc.provider.CallResponse.ReturnDependencies]] = field(_.value)((c_, f_) => c_.copy(value = f_)) @@ -423,7 +423,7 @@ object CallResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.provider // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.CallResponse.ReturnDependenciesEntry]) } - implicit class CallResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CallResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.CallResponse](_l) { + implicit class CallResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CallResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.CallResponse](_l) { def `return`: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getReturn)((c_, f_) => c_.copy(`return` = _root_.scala.Option(f_))) def optionalReturn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.`return`)((c_, f_) => c_.copy(`return` = f_)) def returnDependencies: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, pulumirpc.provider.CallResponse.ReturnDependencies]] = field(_.returnDependencies)((c_, f_) => c_.copy(returnDependencies = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/CheckFailure.scala b/besom-rpc/src/main/scala/pulumirpc/provider/CheckFailure.scala similarity index 93% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/CheckFailure.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/CheckFailure.scala index f460ec61..7b8f6fb2 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/CheckFailure.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/CheckFailure.scala @@ -17,8 +17,8 @@ final case class CheckFailure( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[CheckFailure] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -128,14 +128,14 @@ object CheckFailure extends scalapb.GeneratedMessageCompanion[pulumirpc.provider } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(11) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(11) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.CheckFailure( property = "", reason = "" ) - implicit class CheckFailureLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CheckFailure]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.CheckFailure](_l) { + implicit class CheckFailureLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CheckFailure]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.CheckFailure](_l) { def property: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.property)((c_, f_) => c_.copy(property = f_)) def reason: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.reason)((c_, f_) => c_.copy(reason = f_)) } diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/CheckRequest.scala b/besom-rpc/src/main/scala/pulumirpc/provider/CheckRequest.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/CheckRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/CheckRequest.scala index c6d44782..8bb948f9 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/CheckRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/CheckRequest.scala @@ -23,8 +23,8 @@ final case class CheckRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[CheckRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -174,23 +174,23 @@ object CheckRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provider } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(9) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(9) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = com.google.protobuf.struct.Struct case 3 => __out = com.google.protobuf.struct.Struct } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.CheckRequest( urn = "", olds = _root_.scala.None, news = _root_.scala.None, randomSeed = _root_.com.google.protobuf.ByteString.EMPTY ) - implicit class CheckRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CheckRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.CheckRequest](_l) { + implicit class CheckRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CheckRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.CheckRequest](_l) { def urn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.urn)((c_, f_) => c_.copy(urn = f_)) def olds: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getOlds)((c_, f_) => c_.copy(olds = _root_.scala.Option(f_))) def optionalOlds: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.olds)((c_, f_) => c_.copy(olds = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/CheckResponse.scala b/besom-rpc/src/main/scala/pulumirpc/provider/CheckResponse.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/CheckResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/CheckResponse.scala index 0dfa1b9f..52c8d00d 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/CheckResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/CheckResponse.scala @@ -17,8 +17,8 @@ final case class CheckResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[CheckResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 if (inputs.isDefined) { val __value = inputs.get @@ -121,21 +121,21 @@ object CheckResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.provide } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(10) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(10) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 1 => __out = com.google.protobuf.struct.Struct case 2 => __out = pulumirpc.provider.CheckFailure } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.CheckResponse( inputs = _root_.scala.None, failures = _root_.scala.Seq.empty ) - implicit class CheckResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CheckResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.CheckResponse](_l) { + implicit class CheckResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CheckResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.CheckResponse](_l) { def inputs: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getInputs)((c_, f_) => c_.copy(inputs = _root_.scala.Option(f_))) def optionalInputs: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.inputs)((c_, f_) => c_.copy(inputs = f_)) def failures: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[pulumirpc.provider.CheckFailure]] = field(_.failures)((c_, f_) => c_.copy(failures = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/ConfigureErrorMissingKeys.scala b/besom-rpc/src/main/scala/pulumirpc/provider/ConfigureErrorMissingKeys.scala similarity index 93% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/ConfigureErrorMissingKeys.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/ConfigureErrorMissingKeys.scala index 5683265c..f827601b 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/ConfigureErrorMissingKeys.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/ConfigureErrorMissingKeys.scala @@ -16,8 +16,8 @@ final case class ConfigureErrorMissingKeys( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ConfigureErrorMissingKeys] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 missingKeys.foreach { __item => val __value = __item @@ -100,18 +100,18 @@ object ConfigureErrorMissingKeys extends scalapb.GeneratedMessageCompanion[pulum } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(4) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(4) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 1 => __out = pulumirpc.provider.ConfigureErrorMissingKeys.MissingKey } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.provider.ConfigureErrorMissingKeys.MissingKey ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ConfigureErrorMissingKeys( missingKeys = _root_.scala.Seq.empty ) @@ -127,8 +127,8 @@ object ConfigureErrorMissingKeys extends scalapb.GeneratedMessageCompanion[pulum unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[MissingKey] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -238,14 +238,14 @@ object ConfigureErrorMissingKeys extends scalapb.GeneratedMessageCompanion[pulum } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.provider.ConfigureErrorMissingKeys.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.provider.ConfigureErrorMissingKeys.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ConfigureErrorMissingKeys.MissingKey( name = "", description = "" ) - implicit class MissingKeyLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConfigureErrorMissingKeys.MissingKey]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ConfigureErrorMissingKeys.MissingKey](_l) { + implicit class MissingKeyLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConfigureErrorMissingKeys.MissingKey]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ConfigureErrorMissingKeys.MissingKey](_l) { def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def description: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.description)((c_, f_) => c_.copy(description = f_)) } @@ -261,7 +261,7 @@ object ConfigureErrorMissingKeys extends scalapb.GeneratedMessageCompanion[pulum // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.ConfigureErrorMissingKeys.MissingKey]) } - implicit class ConfigureErrorMissingKeysLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConfigureErrorMissingKeys]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ConfigureErrorMissingKeys](_l) { + implicit class ConfigureErrorMissingKeysLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConfigureErrorMissingKeys]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ConfigureErrorMissingKeys](_l) { def missingKeys: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[pulumirpc.provider.ConfigureErrorMissingKeys.MissingKey]] = field(_.missingKeys)((c_, f_) => c_.copy(missingKeys = f_)) } final val MISSINGKEYS_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/ConfigureRequest.scala b/besom-rpc/src/main/scala/pulumirpc/provider/ConfigureRequest.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/ConfigureRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/ConfigureRequest.scala index a54de93b..ec58bada 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/ConfigureRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/ConfigureRequest.scala @@ -29,8 +29,8 @@ final case class ConfigureRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ConfigureRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 variables.foreach { __item => val __value = pulumirpc.provider.ConfigureRequest._typemapper_variables.toBase(__item) @@ -229,19 +229,19 @@ object ConfigureRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(2) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(2) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 1 => __out = pulumirpc.provider.ConfigureRequest.VariablesEntry case 2 => __out = com.google.protobuf.struct.Struct } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.provider.ConfigureRequest.VariablesEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ConfigureRequest( variables = _root_.scala.collection.immutable.Map.empty, args = _root_.scala.None, @@ -257,8 +257,8 @@ object ConfigureRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[VariablesEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -368,14 +368,14 @@ object ConfigureRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.provider.ConfigureRequest.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.provider.ConfigureRequest.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ConfigureRequest.VariablesEntry( key = "", value = "" ) - implicit class VariablesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConfigureRequest.VariablesEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ConfigureRequest.VariablesEntry](_l) { + implicit class VariablesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConfigureRequest.VariablesEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ConfigureRequest.VariablesEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -394,7 +394,7 @@ object ConfigureRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.ConfigureRequest.VariablesEntry]) } - implicit class ConfigureRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConfigureRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ConfigureRequest](_l) { + implicit class ConfigureRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConfigureRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ConfigureRequest](_l) { def variables: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, _root_.scala.Predef.String]] = field(_.variables)((c_, f_) => c_.copy(variables = f_)) def args: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getArgs)((c_, f_) => c_.copy(args = _root_.scala.Option(f_))) def optionalArgs: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.args)((c_, f_) => c_.copy(args = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/ConfigureResponse.scala b/besom-rpc/src/main/scala/pulumirpc/provider/ConfigureResponse.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/ConfigureResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/ConfigureResponse.scala index f892e85e..c34938fd 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/ConfigureResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/ConfigureResponse.scala @@ -23,8 +23,8 @@ final case class ConfigureResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ConfigureResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -182,16 +182,16 @@ object ConfigureResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.pro } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(3) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(3) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ConfigureResponse( acceptSecrets = false, supportsPreview = false, acceptResources = false, acceptOutputs = false ) - implicit class ConfigureResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConfigureResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ConfigureResponse](_l) { + implicit class ConfigureResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConfigureResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ConfigureResponse](_l) { def acceptSecrets: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.acceptSecrets)((c_, f_) => c_.copy(acceptSecrets = f_)) def supportsPreview: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.supportsPreview)((c_, f_) => c_.copy(supportsPreview = f_)) def acceptResources: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.acceptResources)((c_, f_) => c_.copy(acceptResources = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/ConstructRequest.scala b/besom-rpc/src/main/scala/pulumirpc/provider/ConstructRequest.scala similarity index 96% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/ConstructRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/ConstructRequest.scala index 8fa2ec0d..d32fbc7a 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/ConstructRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/ConstructRequest.scala @@ -88,8 +88,8 @@ final case class ConstructRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ConstructRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -704,8 +704,8 @@ object ConstructRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(22) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(22) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 3 => __out = pulumirpc.provider.ConstructRequest.ConfigEntry case 10 => __out = com.google.protobuf.struct.Struct @@ -715,15 +715,15 @@ object ConstructRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.provider.ConstructRequest.PropertyDependencies, _root_.pulumirpc.provider.ConstructRequest.CustomTimeouts, _root_.pulumirpc.provider.ConstructRequest.ConfigEntry, _root_.pulumirpc.provider.ConstructRequest.InputDependenciesEntry, _root_.pulumirpc.provider.ConstructRequest.ProvidersEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ConstructRequest( project = "", stack = "", @@ -762,8 +762,8 @@ object ConstructRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PropertyDependencies] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 urns.foreach { __item => val __value = __item @@ -844,13 +844,13 @@ object ConstructRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.provider.ConstructRequest.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.provider.ConstructRequest.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ConstructRequest.PropertyDependencies( urns = _root_.scala.Seq.empty ) - implicit class PropertyDependenciesLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructRequest.PropertyDependencies]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ConstructRequest.PropertyDependencies](_l) { + implicit class PropertyDependenciesLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructRequest.PropertyDependencies]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ConstructRequest.PropertyDependencies](_l) { def urns: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.urns)((c_, f_) => c_.copy(urns = f_)) } final val URNS_FIELD_NUMBER = 1 @@ -888,8 +888,8 @@ object ConstructRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[CustomTimeouts] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -1023,15 +1023,15 @@ object ConstructRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.provider.ConstructRequest.javaDescriptor.getNestedTypes().get(1) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.provider.ConstructRequest.scalaDescriptor.nestedMessages(1) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ConstructRequest.CustomTimeouts( create = "", update = "", delete = "" ) - implicit class CustomTimeoutsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructRequest.CustomTimeouts]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ConstructRequest.CustomTimeouts](_l) { + implicit class CustomTimeoutsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructRequest.CustomTimeouts]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ConstructRequest.CustomTimeouts](_l) { def create: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.create)((c_, f_) => c_.copy(create = f_)) def update: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.update)((c_, f_) => c_.copy(update = f_)) def delete: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.delete)((c_, f_) => c_.copy(delete = f_)) @@ -1058,8 +1058,8 @@ object ConstructRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ConfigEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -1169,14 +1169,14 @@ object ConstructRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.provider.ConstructRequest.javaDescriptor.getNestedTypes().get(2) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.provider.ConstructRequest.scalaDescriptor.nestedMessages(2) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ConstructRequest.ConfigEntry( key = "", value = "" ) - implicit class ConfigEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructRequest.ConfigEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ConstructRequest.ConfigEntry](_l) { + implicit class ConfigEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructRequest.ConfigEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ConstructRequest.ConfigEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -1202,8 +1202,8 @@ object ConstructRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[InputDependenciesEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -1309,20 +1309,20 @@ object ConstructRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.provider.ConstructRequest.javaDescriptor.getNestedTypes().get(3) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.provider.ConstructRequest.scalaDescriptor.nestedMessages(3) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = pulumirpc.provider.ConstructRequest.PropertyDependencies } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ConstructRequest.InputDependenciesEntry( key = "", value = _root_.scala.None ) - implicit class InputDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructRequest.InputDependenciesEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ConstructRequest.InputDependenciesEntry](_l) { + implicit class InputDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructRequest.InputDependenciesEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ConstructRequest.InputDependenciesEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructRequest.PropertyDependencies] = field(_.getValue)((c_, f_) => c_.copy(value = _root_.scala.Option(f_))) def optionalValue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[pulumirpc.provider.ConstructRequest.PropertyDependencies]] = field(_.value)((c_, f_) => c_.copy(value = f_)) @@ -1349,8 +1349,8 @@ object ConstructRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ProvidersEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -1460,14 +1460,14 @@ object ConstructRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.provider.ConstructRequest.javaDescriptor.getNestedTypes().get(4) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.provider.ConstructRequest.scalaDescriptor.nestedMessages(4) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ConstructRequest.ProvidersEntry( key = "", value = "" ) - implicit class ProvidersEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructRequest.ProvidersEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ConstructRequest.ProvidersEntry](_l) { + implicit class ProvidersEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructRequest.ProvidersEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ConstructRequest.ProvidersEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -1486,7 +1486,7 @@ object ConstructRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.ConstructRequest.ProvidersEntry]) } - implicit class ConstructRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ConstructRequest](_l) { + implicit class ConstructRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ConstructRequest](_l) { def project: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.project)((c_, f_) => c_.copy(project = f_)) def stack: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.stack)((c_, f_) => c_.copy(stack = f_)) def config: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, _root_.scala.Predef.String]] = field(_.config)((c_, f_) => c_.copy(config = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/ConstructResponse.scala b/besom-rpc/src/main/scala/pulumirpc/provider/ConstructResponse.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/ConstructResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/ConstructResponse.scala index fdd5a136..bb53ab7b 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/ConstructResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/ConstructResponse.scala @@ -20,8 +20,8 @@ final case class ConstructResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ConstructResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -148,20 +148,20 @@ object ConstructResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.pro } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(23) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(23) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = com.google.protobuf.struct.Struct case 3 => __out = pulumirpc.provider.ConstructResponse.StateDependenciesEntry } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.provider.ConstructResponse.PropertyDependencies, _root_.pulumirpc.provider.ConstructResponse.StateDependenciesEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ConstructResponse( urn = "", state = _root_.scala.None, @@ -178,8 +178,8 @@ object ConstructResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.pro unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PropertyDependencies] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 urns.foreach { __item => val __value = __item @@ -260,13 +260,13 @@ object ConstructResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.pro } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.provider.ConstructResponse.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.provider.ConstructResponse.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ConstructResponse.PropertyDependencies( urns = _root_.scala.Seq.empty ) - implicit class PropertyDependenciesLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructResponse.PropertyDependencies]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ConstructResponse.PropertyDependencies](_l) { + implicit class PropertyDependenciesLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructResponse.PropertyDependencies]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ConstructResponse.PropertyDependencies](_l) { def urns: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.urns)((c_, f_) => c_.copy(urns = f_)) } final val URNS_FIELD_NUMBER = 1 @@ -285,8 +285,8 @@ object ConstructResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.pro unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[StateDependenciesEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -392,20 +392,20 @@ object ConstructResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.pro } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.provider.ConstructResponse.javaDescriptor.getNestedTypes().get(1) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.provider.ConstructResponse.scalaDescriptor.nestedMessages(1) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = pulumirpc.provider.ConstructResponse.PropertyDependencies } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ConstructResponse.StateDependenciesEntry( key = "", value = _root_.scala.None ) - implicit class StateDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructResponse.StateDependenciesEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ConstructResponse.StateDependenciesEntry](_l) { + implicit class StateDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructResponse.StateDependenciesEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ConstructResponse.StateDependenciesEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructResponse.PropertyDependencies] = field(_.getValue)((c_, f_) => c_.copy(value = _root_.scala.Option(f_))) def optionalValue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[pulumirpc.provider.ConstructResponse.PropertyDependencies]] = field(_.value)((c_, f_) => c_.copy(value = f_)) @@ -425,7 +425,7 @@ object ConstructResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.pro // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.ConstructResponse.StateDependenciesEntry]) } - implicit class ConstructResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ConstructResponse](_l) { + implicit class ConstructResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ConstructResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ConstructResponse](_l) { def urn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.urn)((c_, f_) => c_.copy(urn = f_)) def state: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getState)((c_, f_) => c_.copy(state = _root_.scala.Option(f_))) def optionalState: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.state)((c_, f_) => c_.copy(state = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/CreateRequest.scala b/besom-rpc/src/main/scala/pulumirpc/provider/CreateRequest.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/CreateRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/CreateRequest.scala index 2e566e86..7fde34dd 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/CreateRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/CreateRequest.scala @@ -23,8 +23,8 @@ final case class CreateRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[CreateRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -178,22 +178,22 @@ object CreateRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provide } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(15) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(15) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = com.google.protobuf.struct.Struct } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.CreateRequest( urn = "", properties = _root_.scala.None, timeout = 0.0, preview = false ) - implicit class CreateRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CreateRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.CreateRequest](_l) { + implicit class CreateRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CreateRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.CreateRequest](_l) { def urn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.urn)((c_, f_) => c_.copy(urn = f_)) def properties: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getProperties)((c_, f_) => c_.copy(properties = _root_.scala.Option(f_))) def optionalProperties: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.properties)((c_, f_) => c_.copy(properties = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/CreateResponse.scala b/besom-rpc/src/main/scala/pulumirpc/provider/CreateResponse.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/CreateResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/CreateResponse.scala index c06eb019..96eec02a 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/CreateResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/CreateResponse.scala @@ -19,8 +19,8 @@ final case class CreateResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[CreateResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -126,20 +126,20 @@ object CreateResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.provid } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(16) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(16) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = com.google.protobuf.struct.Struct } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.CreateResponse( id = "", properties = _root_.scala.None ) - implicit class CreateResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CreateResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.CreateResponse](_l) { + implicit class CreateResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.CreateResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.CreateResponse](_l) { def id: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.id)((c_, f_) => c_.copy(id = f_)) def properties: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getProperties)((c_, f_) => c_.copy(properties = _root_.scala.Option(f_))) def optionalProperties: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.properties)((c_, f_) => c_.copy(properties = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/DeleteRequest.scala b/besom-rpc/src/main/scala/pulumirpc/provider/DeleteRequest.scala similarity index 96% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/DeleteRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/DeleteRequest.scala index 3a298536..7af13ac7 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/DeleteRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/DeleteRequest.scala @@ -26,8 +26,8 @@ final case class DeleteRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[DeleteRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -201,16 +201,16 @@ object DeleteRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provide } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(21) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(21) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 3 => __out = com.google.protobuf.struct.Struct case 5 => __out = com.google.protobuf.struct.Struct } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.DeleteRequest( id = "", urn = "", @@ -218,7 +218,7 @@ object DeleteRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provide timeout = 0.0, oldInputs = _root_.scala.None ) - implicit class DeleteRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.DeleteRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.DeleteRequest](_l) { + implicit class DeleteRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.DeleteRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.DeleteRequest](_l) { def id: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.id)((c_, f_) => c_.copy(id = f_)) def urn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.urn)((c_, f_) => c_.copy(urn = f_)) def properties: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getProperties)((c_, f_) => c_.copy(properties = _root_.scala.Option(f_))) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/DiffRequest.scala b/besom-rpc/src/main/scala/pulumirpc/provider/DiffRequest.scala similarity index 96% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/DiffRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/DiffRequest.scala index 49494f79..bd313e52 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/DiffRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/DiffRequest.scala @@ -29,8 +29,8 @@ final case class DiffRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[DiffRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -219,8 +219,8 @@ object DiffRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provider. } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(12) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(12) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 3 => __out = com.google.protobuf.struct.Struct case 4 => __out = com.google.protobuf.struct.Struct @@ -228,8 +228,8 @@ object DiffRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provider. } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.DiffRequest( id = "", urn = "", @@ -238,7 +238,7 @@ object DiffRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provider. ignoreChanges = _root_.scala.Seq.empty, oldInputs = _root_.scala.None ) - implicit class DiffRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.DiffRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.DiffRequest](_l) { + implicit class DiffRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.DiffRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.DiffRequest](_l) { def id: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.id)((c_, f_) => c_.copy(id = f_)) def urn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.urn)((c_, f_) => c_.copy(urn = f_)) def olds: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getOlds)((c_, f_) => c_.copy(olds = _root_.scala.Option(f_))) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/DiffResponse.scala b/besom-rpc/src/main/scala/pulumirpc/provider/DiffResponse.scala similarity index 96% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/DiffResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/DiffResponse.scala index f102d904..8ab8a720 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/DiffResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/DiffResponse.scala @@ -62,8 +62,8 @@ final case class DiffResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[DiffResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 replaces.foreach { __item => val __value = __item @@ -275,18 +275,18 @@ object DiffResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.provider } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(14) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(14) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 6 => __out = pulumirpc.provider.DiffResponse.DetailedDiffEntry } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.provider.DiffResponse.DetailedDiffEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = { + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = { (__fieldNumber: @_root_.scala.unchecked) match { case 4 => pulumirpc.provider.DiffResponse.DiffChanges } @@ -360,8 +360,8 @@ object DiffResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.provider unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[DetailedDiffEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -467,20 +467,20 @@ object DiffResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.provider } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.provider.DiffResponse.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.provider.DiffResponse.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = pulumirpc.provider.PropertyDiff } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.DiffResponse.DetailedDiffEntry( key = "", value = _root_.scala.None ) - implicit class DetailedDiffEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.DiffResponse.DetailedDiffEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.DiffResponse.DetailedDiffEntry](_l) { + implicit class DetailedDiffEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.DiffResponse.DetailedDiffEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.DiffResponse.DetailedDiffEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.PropertyDiff] = field(_.getValue)((c_, f_) => c_.copy(value = _root_.scala.Option(f_))) def optionalValue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[pulumirpc.provider.PropertyDiff]] = field(_.value)((c_, f_) => c_.copy(value = f_)) @@ -500,7 +500,7 @@ object DiffResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.provider // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.DiffResponse.DetailedDiffEntry]) } - implicit class DiffResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.DiffResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.DiffResponse](_l) { + implicit class DiffResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.DiffResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.DiffResponse](_l) { def replaces: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.replaces)((c_, f_) => c_.copy(replaces = f_)) def stables: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.stables)((c_, f_) => c_.copy(stables = f_)) def deleteBeforeReplace: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.deleteBeforeReplace)((c_, f_) => c_.copy(deleteBeforeReplace = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/ErrorResourceInitFailed.scala b/besom-rpc/src/main/scala/pulumirpc/provider/ErrorResourceInitFailed.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/ErrorResourceInitFailed.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/ErrorResourceInitFailed.scala index 88806179..114fb0f5 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/ErrorResourceInitFailed.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/ErrorResourceInitFailed.scala @@ -26,8 +26,8 @@ final case class ErrorResourceInitFailed( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ErrorResourceInitFailed] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -172,23 +172,23 @@ object ErrorResourceInitFailed extends scalapb.GeneratedMessageCompanion[pulumir } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(24) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(24) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = com.google.protobuf.struct.Struct case 4 => __out = com.google.protobuf.struct.Struct } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ErrorResourceInitFailed( id = "", properties = _root_.scala.None, reasons = _root_.scala.Seq.empty, inputs = _root_.scala.None ) - implicit class ErrorResourceInitFailedLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ErrorResourceInitFailed]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ErrorResourceInitFailed](_l) { + implicit class ErrorResourceInitFailedLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ErrorResourceInitFailed]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ErrorResourceInitFailed](_l) { def id: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.id)((c_, f_) => c_.copy(id = f_)) def properties: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getProperties)((c_, f_) => c_.copy(properties = _root_.scala.Option(f_))) def optionalProperties: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.properties)((c_, f_) => c_.copy(properties = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/GetMappingRequest.scala b/besom-rpc/src/main/scala/pulumirpc/provider/GetMappingRequest.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/GetMappingRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/GetMappingRequest.scala index fa267d5c..2de9cdfb 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/GetMappingRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/GetMappingRequest.scala @@ -24,8 +24,8 @@ final case class GetMappingRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GetMappingRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -135,14 +135,14 @@ object GetMappingRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.pro } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(25) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(25) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.GetMappingRequest( key = "", provider = "" ) - implicit class GetMappingRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.GetMappingRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.GetMappingRequest](_l) { + implicit class GetMappingRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.GetMappingRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.GetMappingRequest](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def provider: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.provider)((c_, f_) => c_.copy(provider = f_)) } diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/GetMappingResponse.scala b/besom-rpc/src/main/scala/pulumirpc/provider/GetMappingResponse.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/GetMappingResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/GetMappingResponse.scala index 9a9d4320..944a24c2 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/GetMappingResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/GetMappingResponse.scala @@ -20,8 +20,8 @@ final case class GetMappingResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GetMappingResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -131,14 +131,14 @@ object GetMappingResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.pr } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(26) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(26) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.GetMappingResponse( provider = "", data = _root_.com.google.protobuf.ByteString.EMPTY ) - implicit class GetMappingResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.GetMappingResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.GetMappingResponse](_l) { + implicit class GetMappingResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.GetMappingResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.GetMappingResponse](_l) { def provider: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.provider)((c_, f_) => c_.copy(provider = f_)) def data: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.data)((c_, f_) => c_.copy(data = f_)) } diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/GetMappingsRequest.scala b/besom-rpc/src/main/scala/pulumirpc/provider/GetMappingsRequest.scala similarity index 92% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/GetMappingsRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/GetMappingsRequest.scala index 3e64aae2..d011b9c2 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/GetMappingsRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/GetMappingsRequest.scala @@ -17,8 +17,8 @@ final case class GetMappingsRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GetMappingsRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -104,13 +104,13 @@ object GetMappingsRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.pr } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(27) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(27) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.GetMappingsRequest( key = "" ) - implicit class GetMappingsRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.GetMappingsRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.GetMappingsRequest](_l) { + implicit class GetMappingsRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.GetMappingsRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.GetMappingsRequest](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) } final val KEY_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/GetMappingsResponse.scala b/besom-rpc/src/main/scala/pulumirpc/provider/GetMappingsResponse.scala similarity index 93% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/GetMappingsResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/GetMappingsResponse.scala index bbd0fadf..e5bc416e 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/GetMappingsResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/GetMappingsResponse.scala @@ -17,8 +17,8 @@ final case class GetMappingsResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GetMappingsResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 providers.foreach { __item => val __value = __item @@ -99,13 +99,13 @@ object GetMappingsResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.p } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(28) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(28) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.GetMappingsResponse( providers = _root_.scala.Seq.empty ) - implicit class GetMappingsResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.GetMappingsResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.GetMappingsResponse](_l) { + implicit class GetMappingsResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.GetMappingsResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.GetMappingsResponse](_l) { def providers: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.providers)((c_, f_) => c_.copy(providers = f_)) } final val PROVIDERS_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/GetSchemaRequest.scala b/besom-rpc/src/main/scala/pulumirpc/provider/GetSchemaRequest.scala similarity index 92% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/GetSchemaRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/GetSchemaRequest.scala index 52091cf6..39c77304 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/GetSchemaRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/GetSchemaRequest.scala @@ -14,8 +14,8 @@ final case class GetSchemaRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GetSchemaRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -101,13 +101,13 @@ object GetSchemaRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.prov } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.GetSchemaRequest( version = 0 ) - implicit class GetSchemaRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.GetSchemaRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.GetSchemaRequest](_l) { + implicit class GetSchemaRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.GetSchemaRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.GetSchemaRequest](_l) { def version: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.version)((c_, f_) => c_.copy(version = f_)) } final val VERSION_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/GetSchemaResponse.scala b/besom-rpc/src/main/scala/pulumirpc/provider/GetSchemaResponse.scala similarity index 92% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/GetSchemaResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/GetSchemaResponse.scala index eed2abab..f7e2e8ff 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/GetSchemaResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/GetSchemaResponse.scala @@ -14,8 +14,8 @@ final case class GetSchemaResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[GetSchemaResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -101,13 +101,13 @@ object GetSchemaResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.pro } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(1) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(1) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.GetSchemaResponse( schema = "" ) - implicit class GetSchemaResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.GetSchemaResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.GetSchemaResponse](_l) { + implicit class GetSchemaResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.GetSchemaResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.GetSchemaResponse](_l) { def schema: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.schema)((c_, f_) => c_.copy(schema = f_)) } final val SCHEMA_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/InvokeRequest.scala b/besom-rpc/src/main/scala/pulumirpc/provider/InvokeRequest.scala similarity index 93% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/InvokeRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/InvokeRequest.scala index 486b8da8..e93cea0a 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/InvokeRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/InvokeRequest.scala @@ -17,8 +17,8 @@ final case class InvokeRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[InvokeRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -124,20 +124,20 @@ object InvokeRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provide } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(5) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(5) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = com.google.protobuf.struct.Struct } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.InvokeRequest( tok = "", args = _root_.scala.None ) - implicit class InvokeRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.InvokeRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.InvokeRequest](_l) { + implicit class InvokeRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.InvokeRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.InvokeRequest](_l) { def tok: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.tok)((c_, f_) => c_.copy(tok = f_)) def args: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getArgs)((c_, f_) => c_.copy(args = _root_.scala.Option(f_))) def optionalArgs: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.args)((c_, f_) => c_.copy(args = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/InvokeResponse.scala b/besom-rpc/src/main/scala/pulumirpc/provider/InvokeResponse.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/InvokeResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/InvokeResponse.scala index f9b9403e..fb43951b 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/InvokeResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/InvokeResponse.scala @@ -17,8 +17,8 @@ final case class InvokeResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[InvokeResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 if (`return`.isDefined) { val __value = `return`.get @@ -121,21 +121,21 @@ object InvokeResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.provid } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(6) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(6) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 1 => __out = com.google.protobuf.struct.Struct case 2 => __out = pulumirpc.provider.CheckFailure } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.InvokeResponse( `return` = _root_.scala.None, failures = _root_.scala.Seq.empty ) - implicit class InvokeResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.InvokeResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.InvokeResponse](_l) { + implicit class InvokeResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.InvokeResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.InvokeResponse](_l) { def `return`: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getReturn)((c_, f_) => c_.copy(`return` = _root_.scala.Option(f_))) def optionalReturn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.`return`)((c_, f_) => c_.copy(`return` = f_)) def failures: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[pulumirpc.provider.CheckFailure]] = field(_.failures)((c_, f_) => c_.copy(failures = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/PropertyDiff.scala b/besom-rpc/src/main/scala/pulumirpc/provider/PropertyDiff.scala similarity index 96% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/PropertyDiff.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/PropertyDiff.scala index 421d8528..2447911e 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/PropertyDiff.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/PropertyDiff.scala @@ -17,8 +17,8 @@ final case class PropertyDiff( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PropertyDiff] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -128,9 +128,9 @@ object PropertyDiff extends scalapb.GeneratedMessageCompanion[pulumirpc.provider } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(13) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(13) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = { + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = { (__fieldNumber: @_root_.scala.unchecked) match { case 1 => pulumirpc.provider.PropertyDiff.Kind } @@ -225,7 +225,7 @@ object PropertyDiff extends scalapb.GeneratedMessageCompanion[pulumirpc.provider def javaDescriptor: _root_.com.google.protobuf.Descriptors.EnumDescriptor = pulumirpc.provider.PropertyDiff.javaDescriptor.getEnumTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.EnumDescriptor = pulumirpc.provider.PropertyDiff.scalaDescriptor.enums(0) } - implicit class PropertyDiffLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.PropertyDiff]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.PropertyDiff](_l) { + implicit class PropertyDiffLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.PropertyDiff]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.PropertyDiff](_l) { def kind: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.PropertyDiff.Kind] = field(_.kind)((c_, f_) => c_.copy(kind = f_)) def inputDiff: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.inputDiff)((c_, f_) => c_.copy(inputDiff = f_)) } diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/ProviderProto.scala b/besom-rpc/src/main/scala/pulumirpc/provider/ProviderProto.scala similarity index 99% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/ProviderProto.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/ProviderProto.scala index 4bccf8e3..18001e27 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/ProviderProto.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/ProviderProto.scala @@ -11,8 +11,8 @@ object ProviderProto extends _root_.scalapb.GeneratedFileObject { com.google.protobuf.empty.EmptyProto, com.google.protobuf.struct.StructProto ) - lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( pulumirpc.provider.GetSchemaRequest, pulumirpc.provider.GetSchemaResponse, pulumirpc.provider.ConfigureRequest, diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/ReadRequest.scala b/besom-rpc/src/main/scala/pulumirpc/provider/ReadRequest.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/ReadRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/ReadRequest.scala index ead7f9b9..d180805e 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/ReadRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/ReadRequest.scala @@ -23,8 +23,8 @@ final case class ReadRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ReadRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -174,23 +174,23 @@ object ReadRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provider. } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(17) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(17) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 3 => __out = com.google.protobuf.struct.Struct case 4 => __out = com.google.protobuf.struct.Struct } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ReadRequest( id = "", urn = "", properties = _root_.scala.None, inputs = _root_.scala.None ) - implicit class ReadRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ReadRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ReadRequest](_l) { + implicit class ReadRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ReadRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ReadRequest](_l) { def id: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.id)((c_, f_) => c_.copy(id = f_)) def urn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.urn)((c_, f_) => c_.copy(urn = f_)) def properties: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getProperties)((c_, f_) => c_.copy(properties = _root_.scala.Option(f_))) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/ReadResponse.scala b/besom-rpc/src/main/scala/pulumirpc/provider/ReadResponse.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/ReadResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/ReadResponse.scala index 15e22af8..b630efa2 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/ReadResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/ReadResponse.scala @@ -20,8 +20,8 @@ final case class ReadResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ReadResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -147,22 +147,22 @@ object ReadResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.provider } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(18) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(18) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = com.google.protobuf.struct.Struct case 3 => __out = com.google.protobuf.struct.Struct } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.ReadResponse( id = "", properties = _root_.scala.None, inputs = _root_.scala.None ) - implicit class ReadResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ReadResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.ReadResponse](_l) { + implicit class ReadResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.ReadResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.ReadResponse](_l) { def id: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.id)((c_, f_) => c_.copy(id = f_)) def properties: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getProperties)((c_, f_) => c_.copy(properties = _root_.scala.Option(f_))) def optionalProperties: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.properties)((c_, f_) => c_.copy(properties = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/ResourceProviderGrpc.scala b/besom-rpc/src/main/scala/pulumirpc/provider/ResourceProviderGrpc.scala similarity index 100% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/ResourceProviderGrpc.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/ResourceProviderGrpc.scala diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/UpdateRequest.scala b/besom-rpc/src/main/scala/pulumirpc/provider/UpdateRequest.scala similarity index 97% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/UpdateRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/UpdateRequest.scala index 8940a14c..70dd862a 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/UpdateRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/UpdateRequest.scala @@ -37,8 +37,8 @@ final case class UpdateRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[UpdateRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -275,8 +275,8 @@ object UpdateRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provide } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(19) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(19) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 3 => __out = com.google.protobuf.struct.Struct case 4 => __out = com.google.protobuf.struct.Struct @@ -284,8 +284,8 @@ object UpdateRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provide } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.UpdateRequest( id = "", urn = "", @@ -296,7 +296,7 @@ object UpdateRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.provide preview = false, oldInputs = _root_.scala.None ) - implicit class UpdateRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.UpdateRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.UpdateRequest](_l) { + implicit class UpdateRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.UpdateRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.UpdateRequest](_l) { def id: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.id)((c_, f_) => c_.copy(id = f_)) def urn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.urn)((c_, f_) => c_.copy(urn = f_)) def olds: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getOlds)((c_, f_) => c_.copy(olds = _root_.scala.Option(f_))) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/provider/UpdateResponse.scala b/besom-rpc/src/main/scala/pulumirpc/provider/UpdateResponse.scala similarity index 92% rename from core/src/main/scala/besom/rpc/pulumirpc/provider/UpdateResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/provider/UpdateResponse.scala index 247355cf..8c96137b 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/provider/UpdateResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/provider/UpdateResponse.scala @@ -14,8 +14,8 @@ final case class UpdateResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[UpdateResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 if (properties.isDefined) { val __value = properties.get @@ -97,19 +97,19 @@ object UpdateResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.provid } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProviderProto.javaDescriptor.getMessageTypes().get(20) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProviderProto.scalaDescriptor.messages(20) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 1 => __out = com.google.protobuf.struct.Struct } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.provider.UpdateResponse( properties = _root_.scala.None ) - implicit class UpdateResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.UpdateResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.provider.UpdateResponse](_l) { + implicit class UpdateResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.provider.UpdateResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.provider.UpdateResponse](_l) { def properties: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getProperties)((c_, f_) => c_.copy(properties = _root_.scala.Option(f_))) def optionalProperties: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.properties)((c_, f_) => c_.copy(properties = f_)) } diff --git a/core/src/main/scala/besom/rpc/pulumirpc/resource/ReadResourceRequest.scala b/besom-rpc/src/main/scala/pulumirpc/resource/ReadResourceRequest.scala similarity index 97% rename from core/src/main/scala/besom/rpc/pulumirpc/resource/ReadResourceRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/resource/ReadResourceRequest.scala index 77c93c41..80f7d23d 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/resource/ReadResourceRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/resource/ReadResourceRequest.scala @@ -55,8 +55,8 @@ final case class ReadResourceRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ReadResourceRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -433,8 +433,8 @@ object ReadResourceRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.r } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ResourceProto.javaDescriptor.getMessageTypes().get(2) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ResourceProto.scalaDescriptor.messages(2) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 5 => __out = com.google.protobuf.struct.Struct case 15 => __out = pulumirpc.resource.ReadResourceRequest.PluginChecksumsEntry @@ -442,11 +442,11 @@ object ReadResourceRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.r } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.resource.ReadResourceRequest.PluginChecksumsEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.ReadResourceRequest( id = "", `type` = "", @@ -470,8 +470,8 @@ object ReadResourceRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.r unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PluginChecksumsEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -581,14 +581,14 @@ object ReadResourceRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.r } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.resource.ReadResourceRequest.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.resource.ReadResourceRequest.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.ReadResourceRequest.PluginChecksumsEntry( key = "", value = _root_.com.google.protobuf.ByteString.EMPTY ) - implicit class PluginChecksumsEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ReadResourceRequest.PluginChecksumsEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.ReadResourceRequest.PluginChecksumsEntry](_l) { + implicit class PluginChecksumsEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ReadResourceRequest.PluginChecksumsEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.ReadResourceRequest.PluginChecksumsEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -607,7 +607,7 @@ object ReadResourceRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.r // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.ReadResourceRequest.PluginChecksumsEntry]) } - implicit class ReadResourceRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ReadResourceRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.ReadResourceRequest](_l) { + implicit class ReadResourceRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ReadResourceRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.ReadResourceRequest](_l) { def id: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.id)((c_, f_) => c_.copy(id = f_)) def `type`: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.`type`)((c_, f_) => c_.copy(`type` = f_)) def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/resource/ReadResourceResponse.scala b/besom-rpc/src/main/scala/pulumirpc/resource/ReadResourceResponse.scala similarity index 93% rename from core/src/main/scala/besom/rpc/pulumirpc/resource/ReadResourceResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/resource/ReadResourceResponse.scala index 64dba87d..64bb6d5c 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/resource/ReadResourceResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/resource/ReadResourceResponse.scala @@ -19,8 +19,8 @@ final case class ReadResourceResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ReadResourceResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -126,20 +126,20 @@ object ReadResourceResponse extends scalapb.GeneratedMessageCompanion[pulumirpc. } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ResourceProto.javaDescriptor.getMessageTypes().get(3) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ResourceProto.scalaDescriptor.messages(3) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = com.google.protobuf.struct.Struct } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.ReadResourceResponse( urn = "", properties = _root_.scala.None ) - implicit class ReadResourceResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ReadResourceResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.ReadResourceResponse](_l) { + implicit class ReadResourceResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ReadResourceResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.ReadResourceResponse](_l) { def urn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.urn)((c_, f_) => c_.copy(urn = f_)) def properties: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getProperties)((c_, f_) => c_.copy(properties = _root_.scala.Option(f_))) def optionalProperties: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.properties)((c_, f_) => c_.copy(properties = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/resource/RegisterResourceOutputsRequest.scala b/besom-rpc/src/main/scala/pulumirpc/resource/RegisterResourceOutputsRequest.scala similarity index 93% rename from core/src/main/scala/besom/rpc/pulumirpc/resource/RegisterResourceOutputsRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/resource/RegisterResourceOutputsRequest.scala index 7b24ad0a..111aa7f6 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/resource/RegisterResourceOutputsRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/resource/RegisterResourceOutputsRequest.scala @@ -19,8 +19,8 @@ final case class RegisterResourceOutputsRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[RegisterResourceOutputsRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -126,20 +126,20 @@ object RegisterResourceOutputsRequest extends scalapb.GeneratedMessageCompanion[ } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ResourceProto.javaDescriptor.getMessageTypes().get(6) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ResourceProto.scalaDescriptor.messages(6) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = com.google.protobuf.struct.Struct } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.RegisterResourceOutputsRequest( urn = "", outputs = _root_.scala.None ) - implicit class RegisterResourceOutputsRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceOutputsRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.RegisterResourceOutputsRequest](_l) { + implicit class RegisterResourceOutputsRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceOutputsRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.RegisterResourceOutputsRequest](_l) { def urn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.urn)((c_, f_) => c_.copy(urn = f_)) def outputs: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getOutputs)((c_, f_) => c_.copy(outputs = _root_.scala.Option(f_))) def optionalOutputs: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.outputs)((c_, f_) => c_.copy(outputs = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/resource/RegisterResourceRequest.scala b/besom-rpc/src/main/scala/pulumirpc/resource/RegisterResourceRequest.scala similarity index 97% rename from core/src/main/scala/besom/rpc/pulumirpc/resource/RegisterResourceRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/resource/RegisterResourceRequest.scala index 68a70aa9..faae2d78 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/resource/RegisterResourceRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/resource/RegisterResourceRequest.scala @@ -115,8 +115,8 @@ final case class RegisterResourceRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[RegisterResourceRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -894,8 +894,8 @@ object RegisterResourceRequest extends scalapb.GeneratedMessageCompanion[pulumir } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ResourceProto.javaDescriptor.getMessageTypes().get(4) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ResourceProto.scalaDescriptor.messages(4) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 5 => __out = com.google.protobuf.struct.Struct case 9 => __out = pulumirpc.resource.RegisterResourceRequest.PropertyDependenciesEntry @@ -908,15 +908,15 @@ object RegisterResourceRequest extends scalapb.GeneratedMessageCompanion[pulumir } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.resource.RegisterResourceRequest.PropertyDependencies, _root_.pulumirpc.resource.RegisterResourceRequest.CustomTimeouts, _root_.pulumirpc.resource.RegisterResourceRequest.PropertyDependenciesEntry, _root_.pulumirpc.resource.RegisterResourceRequest.ProvidersEntry, _root_.pulumirpc.resource.RegisterResourceRequest.PluginChecksumsEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.RegisterResourceRequest( `type` = "", name = "", @@ -962,8 +962,8 @@ object RegisterResourceRequest extends scalapb.GeneratedMessageCompanion[pulumir unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PropertyDependencies] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 urns.foreach { __item => val __value = __item @@ -1044,13 +1044,13 @@ object RegisterResourceRequest extends scalapb.GeneratedMessageCompanion[pulumir } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.resource.RegisterResourceRequest.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.resource.RegisterResourceRequest.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.RegisterResourceRequest.PropertyDependencies( urns = _root_.scala.Seq.empty ) - implicit class PropertyDependenciesLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceRequest.PropertyDependencies]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.RegisterResourceRequest.PropertyDependencies](_l) { + implicit class PropertyDependenciesLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceRequest.PropertyDependencies]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.RegisterResourceRequest.PropertyDependencies](_l) { def urns: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.urns)((c_, f_) => c_.copy(urns = f_)) } final val URNS_FIELD_NUMBER = 1 @@ -1079,8 +1079,8 @@ object RegisterResourceRequest extends scalapb.GeneratedMessageCompanion[pulumir unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[CustomTimeouts] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -1214,15 +1214,15 @@ object RegisterResourceRequest extends scalapb.GeneratedMessageCompanion[pulumir } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.resource.RegisterResourceRequest.javaDescriptor.getNestedTypes().get(1) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.resource.RegisterResourceRequest.scalaDescriptor.nestedMessages(1) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.RegisterResourceRequest.CustomTimeouts( create = "", update = "", delete = "" ) - implicit class CustomTimeoutsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceRequest.CustomTimeouts]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.RegisterResourceRequest.CustomTimeouts](_l) { + implicit class CustomTimeoutsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceRequest.CustomTimeouts]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.RegisterResourceRequest.CustomTimeouts](_l) { def create: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.create)((c_, f_) => c_.copy(create = f_)) def update: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.update)((c_, f_) => c_.copy(update = f_)) def delete: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.delete)((c_, f_) => c_.copy(delete = f_)) @@ -1249,8 +1249,8 @@ object RegisterResourceRequest extends scalapb.GeneratedMessageCompanion[pulumir unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PropertyDependenciesEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -1356,20 +1356,20 @@ object RegisterResourceRequest extends scalapb.GeneratedMessageCompanion[pulumir } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.resource.RegisterResourceRequest.javaDescriptor.getNestedTypes().get(2) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.resource.RegisterResourceRequest.scalaDescriptor.nestedMessages(2) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = pulumirpc.resource.RegisterResourceRequest.PropertyDependencies } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.RegisterResourceRequest.PropertyDependenciesEntry( key = "", value = _root_.scala.None ) - implicit class PropertyDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceRequest.PropertyDependenciesEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.RegisterResourceRequest.PropertyDependenciesEntry](_l) { + implicit class PropertyDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceRequest.PropertyDependenciesEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.RegisterResourceRequest.PropertyDependenciesEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceRequest.PropertyDependencies] = field(_.getValue)((c_, f_) => c_.copy(value = _root_.scala.Option(f_))) def optionalValue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[pulumirpc.resource.RegisterResourceRequest.PropertyDependencies]] = field(_.value)((c_, f_) => c_.copy(value = f_)) @@ -1396,8 +1396,8 @@ object RegisterResourceRequest extends scalapb.GeneratedMessageCompanion[pulumir unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ProvidersEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -1507,14 +1507,14 @@ object RegisterResourceRequest extends scalapb.GeneratedMessageCompanion[pulumir } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.resource.RegisterResourceRequest.javaDescriptor.getNestedTypes().get(3) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.resource.RegisterResourceRequest.scalaDescriptor.nestedMessages(3) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.RegisterResourceRequest.ProvidersEntry( key = "", value = "" ) - implicit class ProvidersEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceRequest.ProvidersEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.RegisterResourceRequest.ProvidersEntry](_l) { + implicit class ProvidersEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceRequest.ProvidersEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.RegisterResourceRequest.ProvidersEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -1540,8 +1540,8 @@ object RegisterResourceRequest extends scalapb.GeneratedMessageCompanion[pulumir unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PluginChecksumsEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -1651,14 +1651,14 @@ object RegisterResourceRequest extends scalapb.GeneratedMessageCompanion[pulumir } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.resource.RegisterResourceRequest.javaDescriptor.getNestedTypes().get(4) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.resource.RegisterResourceRequest.scalaDescriptor.nestedMessages(4) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.RegisterResourceRequest.PluginChecksumsEntry( key = "", value = _root_.com.google.protobuf.ByteString.EMPTY ) - implicit class PluginChecksumsEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceRequest.PluginChecksumsEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.RegisterResourceRequest.PluginChecksumsEntry](_l) { + implicit class PluginChecksumsEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceRequest.PluginChecksumsEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.RegisterResourceRequest.PluginChecksumsEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -1677,7 +1677,7 @@ object RegisterResourceRequest extends scalapb.GeneratedMessageCompanion[pulumir // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.RegisterResourceRequest.PluginChecksumsEntry]) } - implicit class RegisterResourceRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.RegisterResourceRequest](_l) { + implicit class RegisterResourceRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.RegisterResourceRequest](_l) { def `type`: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.`type`)((c_, f_) => c_.copy(`type` = f_)) def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def parent: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.parent)((c_, f_) => c_.copy(parent = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/resource/RegisterResourceResponse.scala b/besom-rpc/src/main/scala/pulumirpc/resource/RegisterResourceResponse.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/resource/RegisterResourceResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/resource/RegisterResourceResponse.scala index 3c8b164c..ee0c8bc7 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/resource/RegisterResourceResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/resource/RegisterResourceResponse.scala @@ -35,8 +35,8 @@ final case class RegisterResourceResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[RegisterResourceResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -254,20 +254,20 @@ object RegisterResourceResponse extends scalapb.GeneratedMessageCompanion[pulumi } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ResourceProto.javaDescriptor.getMessageTypes().get(5) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ResourceProto.scalaDescriptor.messages(5) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 3 => __out = com.google.protobuf.struct.Struct case 6 => __out = pulumirpc.resource.RegisterResourceResponse.PropertyDependenciesEntry } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.resource.RegisterResourceResponse.PropertyDependencies, _root_.pulumirpc.resource.RegisterResourceResponse.PropertyDependenciesEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = { + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = { (__fieldNumber: @_root_.scala.unchecked) match { case 7 => pulumirpc.resource.Result } @@ -292,8 +292,8 @@ object RegisterResourceResponse extends scalapb.GeneratedMessageCompanion[pulumi unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PropertyDependencies] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 urns.foreach { __item => val __value = __item @@ -374,13 +374,13 @@ object RegisterResourceResponse extends scalapb.GeneratedMessageCompanion[pulumi } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.resource.RegisterResourceResponse.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.resource.RegisterResourceResponse.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.RegisterResourceResponse.PropertyDependencies( urns = _root_.scala.Seq.empty ) - implicit class PropertyDependenciesLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceResponse.PropertyDependencies]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.RegisterResourceResponse.PropertyDependencies](_l) { + implicit class PropertyDependenciesLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceResponse.PropertyDependencies]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.RegisterResourceResponse.PropertyDependencies](_l) { def urns: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.urns)((c_, f_) => c_.copy(urns = f_)) } final val URNS_FIELD_NUMBER = 1 @@ -399,8 +399,8 @@ object RegisterResourceResponse extends scalapb.GeneratedMessageCompanion[pulumi unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PropertyDependenciesEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -506,20 +506,20 @@ object RegisterResourceResponse extends scalapb.GeneratedMessageCompanion[pulumi } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.resource.RegisterResourceResponse.javaDescriptor.getNestedTypes().get(1) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.resource.RegisterResourceResponse.scalaDescriptor.nestedMessages(1) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = pulumirpc.resource.RegisterResourceResponse.PropertyDependencies } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.RegisterResourceResponse.PropertyDependenciesEntry( key = "", value = _root_.scala.None ) - implicit class PropertyDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceResponse.PropertyDependenciesEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.RegisterResourceResponse.PropertyDependenciesEntry](_l) { + implicit class PropertyDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceResponse.PropertyDependenciesEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.RegisterResourceResponse.PropertyDependenciesEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceResponse.PropertyDependencies] = field(_.getValue)((c_, f_) => c_.copy(value = _root_.scala.Option(f_))) def optionalValue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[pulumirpc.resource.RegisterResourceResponse.PropertyDependencies]] = field(_.value)((c_, f_) => c_.copy(value = f_)) @@ -539,7 +539,7 @@ object RegisterResourceResponse extends scalapb.GeneratedMessageCompanion[pulumi // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.RegisterResourceResponse.PropertyDependenciesEntry]) } - implicit class RegisterResourceResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.RegisterResourceResponse](_l) { + implicit class RegisterResourceResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.RegisterResourceResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.RegisterResourceResponse](_l) { def urn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.urn)((c_, f_) => c_.copy(urn = f_)) def id: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.id)((c_, f_) => c_.copy(id = f_)) def `object`: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getObject)((c_, f_) => c_.copy(`object` = _root_.scala.Option(f_))) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/resource/ResourceCallRequest.scala b/besom-rpc/src/main/scala/pulumirpc/resource/ResourceCallRequest.scala similarity index 95% rename from core/src/main/scala/besom/rpc/pulumirpc/resource/ResourceCallRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/resource/ResourceCallRequest.scala index 6f077756..5cc69a1c 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/resource/ResourceCallRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/resource/ResourceCallRequest.scala @@ -35,8 +35,8 @@ final case class ResourceCallRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ResourceCallRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -276,8 +276,8 @@ object ResourceCallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.r } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ResourceProto.javaDescriptor.getMessageTypes().get(8) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ResourceProto.scalaDescriptor.messages(8) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = com.google.protobuf.struct.Struct case 3 => __out = pulumirpc.resource.ResourceCallRequest.ArgDependenciesEntry @@ -286,13 +286,13 @@ object ResourceCallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.r } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.resource.ResourceCallRequest.ArgumentDependencies, _root_.pulumirpc.resource.ResourceCallRequest.ArgDependenciesEntry, _root_.pulumirpc.resource.ResourceCallRequest.PluginChecksumsEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.ResourceCallRequest( tok = "", args = _root_.scala.None, @@ -314,8 +314,8 @@ object ResourceCallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.r unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ArgumentDependencies] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 urns.foreach { __item => val __value = __item @@ -396,13 +396,13 @@ object ResourceCallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.r } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.resource.ResourceCallRequest.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.resource.ResourceCallRequest.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.ResourceCallRequest.ArgumentDependencies( urns = _root_.scala.Seq.empty ) - implicit class ArgumentDependenciesLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ResourceCallRequest.ArgumentDependencies]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.ResourceCallRequest.ArgumentDependencies](_l) { + implicit class ArgumentDependenciesLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ResourceCallRequest.ArgumentDependencies]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.ResourceCallRequest.ArgumentDependencies](_l) { def urns: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.urns)((c_, f_) => c_.copy(urns = f_)) } final val URNS_FIELD_NUMBER = 1 @@ -421,8 +421,8 @@ object ResourceCallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.r unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ArgDependenciesEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -528,20 +528,20 @@ object ResourceCallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.r } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.resource.ResourceCallRequest.javaDescriptor.getNestedTypes().get(1) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.resource.ResourceCallRequest.scalaDescriptor.nestedMessages(1) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = pulumirpc.resource.ResourceCallRequest.ArgumentDependencies } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.ResourceCallRequest.ArgDependenciesEntry( key = "", value = _root_.scala.None ) - implicit class ArgDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ResourceCallRequest.ArgDependenciesEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.ResourceCallRequest.ArgDependenciesEntry](_l) { + implicit class ArgDependenciesEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ResourceCallRequest.ArgDependenciesEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.ResourceCallRequest.ArgDependenciesEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ResourceCallRequest.ArgumentDependencies] = field(_.getValue)((c_, f_) => c_.copy(value = _root_.scala.Option(f_))) def optionalValue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[pulumirpc.resource.ResourceCallRequest.ArgumentDependencies]] = field(_.value)((c_, f_) => c_.copy(value = f_)) @@ -568,8 +568,8 @@ object ResourceCallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.r unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PluginChecksumsEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -679,14 +679,14 @@ object ResourceCallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.r } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.resource.ResourceCallRequest.javaDescriptor.getNestedTypes().get(2) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.resource.ResourceCallRequest.scalaDescriptor.nestedMessages(2) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.ResourceCallRequest.PluginChecksumsEntry( key = "", value = _root_.com.google.protobuf.ByteString.EMPTY ) - implicit class PluginChecksumsEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ResourceCallRequest.PluginChecksumsEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.ResourceCallRequest.PluginChecksumsEntry](_l) { + implicit class PluginChecksumsEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ResourceCallRequest.PluginChecksumsEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.ResourceCallRequest.PluginChecksumsEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -705,7 +705,7 @@ object ResourceCallRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.r // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.ResourceCallRequest.PluginChecksumsEntry]) } - implicit class ResourceCallRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ResourceCallRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.ResourceCallRequest](_l) { + implicit class ResourceCallRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ResourceCallRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.ResourceCallRequest](_l) { def tok: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.tok)((c_, f_) => c_.copy(tok = f_)) def args: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getArgs)((c_, f_) => c_.copy(args = _root_.scala.Option(f_))) def optionalArgs: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.args)((c_, f_) => c_.copy(args = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/resource/ResourceInvokeRequest.scala b/besom-rpc/src/main/scala/pulumirpc/resource/ResourceInvokeRequest.scala similarity index 96% rename from core/src/main/scala/besom/rpc/pulumirpc/resource/ResourceInvokeRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/resource/ResourceInvokeRequest.scala index 65690e30..feefdcbf 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/resource/ResourceInvokeRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/resource/ResourceInvokeRequest.scala @@ -35,8 +35,8 @@ final case class ResourceInvokeRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ResourceInvokeRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -279,8 +279,8 @@ object ResourceInvokeRequest extends scalapb.GeneratedMessageCompanion[pulumirpc } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ResourceProto.javaDescriptor.getMessageTypes().get(7) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ResourceProto.scalaDescriptor.messages(7) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 2 => __out = com.google.protobuf.struct.Struct case 8 => __out = pulumirpc.resource.ResourceInvokeRequest.PluginChecksumsEntry @@ -288,11 +288,11 @@ object ResourceInvokeRequest extends scalapb.GeneratedMessageCompanion[pulumirpc } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.resource.ResourceInvokeRequest.PluginChecksumsEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.ResourceInvokeRequest( tok = "", args = _root_.scala.None, @@ -310,8 +310,8 @@ object ResourceInvokeRequest extends scalapb.GeneratedMessageCompanion[pulumirpc unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PluginChecksumsEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -421,14 +421,14 @@ object ResourceInvokeRequest extends scalapb.GeneratedMessageCompanion[pulumirpc } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.resource.ResourceInvokeRequest.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.resource.ResourceInvokeRequest.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.ResourceInvokeRequest.PluginChecksumsEntry( key = "", value = _root_.com.google.protobuf.ByteString.EMPTY ) - implicit class PluginChecksumsEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ResourceInvokeRequest.PluginChecksumsEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.ResourceInvokeRequest.PluginChecksumsEntry](_l) { + implicit class PluginChecksumsEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ResourceInvokeRequest.PluginChecksumsEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.ResourceInvokeRequest.PluginChecksumsEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -447,7 +447,7 @@ object ResourceInvokeRequest extends scalapb.GeneratedMessageCompanion[pulumirpc // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.ResourceInvokeRequest.PluginChecksumsEntry]) } - implicit class ResourceInvokeRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ResourceInvokeRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.ResourceInvokeRequest](_l) { + implicit class ResourceInvokeRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.ResourceInvokeRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.ResourceInvokeRequest](_l) { def tok: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.tok)((c_, f_) => c_.copy(tok = f_)) def args: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getArgs)((c_, f_) => c_.copy(args = _root_.scala.Option(f_))) def optionalArgs: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.args)((c_, f_) => c_.copy(args = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/resource/ResourceMonitorGrpc.scala b/besom-rpc/src/main/scala/pulumirpc/resource/ResourceMonitorGrpc.scala similarity index 100% rename from core/src/main/scala/besom/rpc/pulumirpc/resource/ResourceMonitorGrpc.scala rename to besom-rpc/src/main/scala/pulumirpc/resource/ResourceMonitorGrpc.scala diff --git a/core/src/main/scala/besom/rpc/pulumirpc/resource/ResourceProto.scala b/besom-rpc/src/main/scala/pulumirpc/resource/ResourceProto.scala similarity index 99% rename from core/src/main/scala/besom/rpc/pulumirpc/resource/ResourceProto.scala rename to besom-rpc/src/main/scala/pulumirpc/resource/ResourceProto.scala index 77fd326d..6e69086a 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/resource/ResourceProto.scala +++ b/besom-rpc/src/main/scala/pulumirpc/resource/ResourceProto.scala @@ -14,8 +14,8 @@ object ResourceProto extends _root_.scalapb.GeneratedFileObject { pulumirpc.source.SourceProto, pulumirpc.callback.CallbackProto ) - lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( pulumirpc.resource.SupportsFeatureRequest, pulumirpc.resource.SupportsFeatureResponse, pulumirpc.resource.ReadResourceRequest, diff --git a/core/src/main/scala/besom/rpc/pulumirpc/resource/Result.scala b/besom-rpc/src/main/scala/pulumirpc/resource/Result.scala similarity index 100% rename from core/src/main/scala/besom/rpc/pulumirpc/resource/Result.scala rename to besom-rpc/src/main/scala/pulumirpc/resource/Result.scala diff --git a/core/src/main/scala/besom/rpc/pulumirpc/resource/SupportsFeatureRequest.scala b/besom-rpc/src/main/scala/pulumirpc/resource/SupportsFeatureRequest.scala similarity index 92% rename from core/src/main/scala/besom/rpc/pulumirpc/resource/SupportsFeatureRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/resource/SupportsFeatureRequest.scala index 74e20200..fd55b56b 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/resource/SupportsFeatureRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/resource/SupportsFeatureRequest.scala @@ -17,8 +17,8 @@ final case class SupportsFeatureRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[SupportsFeatureRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -104,13 +104,13 @@ object SupportsFeatureRequest extends scalapb.GeneratedMessageCompanion[pulumirp } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ResourceProto.javaDescriptor.getMessageTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ResourceProto.scalaDescriptor.messages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.SupportsFeatureRequest( id = "" ) - implicit class SupportsFeatureRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.SupportsFeatureRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.SupportsFeatureRequest](_l) { + implicit class SupportsFeatureRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.SupportsFeatureRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.SupportsFeatureRequest](_l) { def id: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.id)((c_, f_) => c_.copy(id = f_)) } final val ID_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/resource/SupportsFeatureResponse.scala b/besom-rpc/src/main/scala/pulumirpc/resource/SupportsFeatureResponse.scala similarity index 92% rename from core/src/main/scala/besom/rpc/pulumirpc/resource/SupportsFeatureResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/resource/SupportsFeatureResponse.scala index b8cdb142..adfd8855 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/resource/SupportsFeatureResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/resource/SupportsFeatureResponse.scala @@ -14,8 +14,8 @@ final case class SupportsFeatureResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[SupportsFeatureResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -101,13 +101,13 @@ object SupportsFeatureResponse extends scalapb.GeneratedMessageCompanion[pulumir } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ResourceProto.javaDescriptor.getMessageTypes().get(1) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ResourceProto.scalaDescriptor.messages(1) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.SupportsFeatureResponse( hasSupport = false ) - implicit class SupportsFeatureResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.SupportsFeatureResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.SupportsFeatureResponse](_l) { + implicit class SupportsFeatureResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.SupportsFeatureResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.SupportsFeatureResponse](_l) { def hasSupport: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.hasSupport)((c_, f_) => c_.copy(hasSupport = f_)) } final val HASSUPPORT_FIELD_NUMBER = 1 diff --git a/core/src/main/scala/besom/rpc/pulumirpc/resource/TransformRequest.scala b/besom-rpc/src/main/scala/pulumirpc/resource/TransformRequest.scala similarity index 96% rename from core/src/main/scala/besom/rpc/pulumirpc/resource/TransformRequest.scala rename to besom-rpc/src/main/scala/pulumirpc/resource/TransformRequest.scala index 3cae47c2..d2b2b3ba 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/resource/TransformRequest.scala +++ b/besom-rpc/src/main/scala/pulumirpc/resource/TransformRequest.scala @@ -29,8 +29,8 @@ final case class TransformRequest( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[TransformRequest] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -228,16 +228,16 @@ object TransformRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.reso } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ResourceProto.javaDescriptor.getMessageTypes().get(10) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ResourceProto.scalaDescriptor.messages(10) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 5 => __out = com.google.protobuf.struct.Struct case 6 => __out = pulumirpc.resource.TransformResourceOptions } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.TransformRequest( `type` = "", name = "", @@ -246,7 +246,7 @@ object TransformRequest extends scalapb.GeneratedMessageCompanion[pulumirpc.reso properties = _root_.scala.None, options = _root_.scala.None ) - implicit class TransformRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.TransformRequest]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.TransformRequest](_l) { + implicit class TransformRequestLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.TransformRequest]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.TransformRequest](_l) { def `type`: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.`type`)((c_, f_) => c_.copy(`type` = f_)) def name: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.name)((c_, f_) => c_.copy(name = f_)) def custom: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.custom)((c_, f_) => c_.copy(custom = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/resource/TransformResourceOptions.scala b/besom-rpc/src/main/scala/pulumirpc/resource/TransformResourceOptions.scala similarity index 96% rename from core/src/main/scala/besom/rpc/pulumirpc/resource/TransformResourceOptions.scala rename to besom-rpc/src/main/scala/pulumirpc/resource/TransformResourceOptions.scala index 43228634..d07ec9c2 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/resource/TransformResourceOptions.scala +++ b/besom-rpc/src/main/scala/pulumirpc/resource/TransformResourceOptions.scala @@ -27,8 +27,8 @@ final case class TransformResourceOptions( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[TransformResourceOptions] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 dependsOn.foreach { __item => val __value = __item @@ -411,8 +411,8 @@ object TransformResourceOptions extends scalapb.GeneratedMessageCompanion[pulumi } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ResourceProto.javaDescriptor.getMessageTypes().get(9) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ResourceProto.scalaDescriptor.messages(9) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 6 => __out = pulumirpc.alias.Alias case 8 => __out = pulumirpc.resource.RegisterResourceRequest.CustomTimeouts @@ -421,12 +421,12 @@ object TransformResourceOptions extends scalapb.GeneratedMessageCompanion[pulumi } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( _root_.pulumirpc.resource.TransformResourceOptions.ProvidersEntry, _root_.pulumirpc.resource.TransformResourceOptions.PluginChecksumsEntry ) - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.TransformResourceOptions( dependsOn = _root_.scala.Seq.empty, protect = false, @@ -451,8 +451,8 @@ object TransformResourceOptions extends scalapb.GeneratedMessageCompanion[pulumi unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ProvidersEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -562,14 +562,14 @@ object TransformResourceOptions extends scalapb.GeneratedMessageCompanion[pulumi } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.resource.TransformResourceOptions.javaDescriptor.getNestedTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.resource.TransformResourceOptions.scalaDescriptor.nestedMessages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.TransformResourceOptions.ProvidersEntry( key = "", value = "" ) - implicit class ProvidersEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.TransformResourceOptions.ProvidersEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.TransformResourceOptions.ProvidersEntry](_l) { + implicit class ProvidersEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.TransformResourceOptions.ProvidersEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.TransformResourceOptions.ProvidersEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -595,8 +595,8 @@ object TransformResourceOptions extends scalapb.GeneratedMessageCompanion[pulumi unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[PluginChecksumsEntry] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -706,14 +706,14 @@ object TransformResourceOptions extends scalapb.GeneratedMessageCompanion[pulumi } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = pulumirpc.resource.TransformResourceOptions.javaDescriptor.getNestedTypes().get(1) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = pulumirpc.resource.TransformResourceOptions.scalaDescriptor.nestedMessages(1) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.TransformResourceOptions.PluginChecksumsEntry( key = "", value = _root_.com.google.protobuf.ByteString.EMPTY ) - implicit class PluginChecksumsEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.TransformResourceOptions.PluginChecksumsEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.TransformResourceOptions.PluginChecksumsEntry](_l) { + implicit class PluginChecksumsEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.TransformResourceOptions.PluginChecksumsEntry]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.TransformResourceOptions.PluginChecksumsEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) def value: _root_.scalapb.lenses.Lens[UpperPB, _root_.com.google.protobuf.ByteString] = field(_.value)((c_, f_) => c_.copy(value = f_)) } @@ -732,7 +732,7 @@ object TransformResourceOptions extends scalapb.GeneratedMessageCompanion[pulumi // @@protoc_insertion_point(GeneratedMessageCompanion[pulumirpc.TransformResourceOptions.PluginChecksumsEntry]) } - implicit class TransformResourceOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.TransformResourceOptions]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.TransformResourceOptions](_l) { + implicit class TransformResourceOptionsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.TransformResourceOptions]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.TransformResourceOptions](_l) { def dependsOn: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.dependsOn)((c_, f_) => c_.copy(dependsOn = f_)) def protect: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.protect)((c_, f_) => c_.copy(protect = f_)) def ignoreChanges: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.ignoreChanges)((c_, f_) => c_.copy(ignoreChanges = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/resource/TransformResponse.scala b/besom-rpc/src/main/scala/pulumirpc/resource/TransformResponse.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/resource/TransformResponse.scala rename to besom-rpc/src/main/scala/pulumirpc/resource/TransformResponse.scala index 56d8aa57..ef1f0a10 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/resource/TransformResponse.scala +++ b/besom-rpc/src/main/scala/pulumirpc/resource/TransformResponse.scala @@ -17,8 +17,8 @@ final case class TransformResponse( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[TransformResponse] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 if (properties.isDefined) { val __value = properties.get @@ -120,21 +120,21 @@ object TransformResponse extends scalapb.GeneratedMessageCompanion[pulumirpc.res } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ResourceProto.javaDescriptor.getMessageTypes().get(11) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ResourceProto.scalaDescriptor.messages(11) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { - var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = { + var __out: _root_.scalapb.GeneratedMessageCompanion[?] = null (__number: @_root_.scala.unchecked) match { case 1 => __out = com.google.protobuf.struct.Struct case 2 => __out = pulumirpc.resource.TransformResourceOptions } __out } - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.resource.TransformResponse( properties = _root_.scala.None, options = _root_.scala.None ) - implicit class TransformResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.TransformResponse]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.resource.TransformResponse](_l) { + implicit class TransformResponseLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.TransformResponse]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.resource.TransformResponse](_l) { def properties: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.struct.Struct] = field(_.getProperties)((c_, f_) => c_.copy(properties = _root_.scala.Option(f_))) def optionalProperties: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[com.google.protobuf.struct.Struct]] = field(_.properties)((c_, f_) => c_.copy(properties = f_)) def options: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.resource.TransformResourceOptions] = field(_.getOptions)((c_, f_) => c_.copy(options = _root_.scala.Option(f_))) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/source/SourcePosition.scala b/besom-rpc/src/main/scala/pulumirpc/source/SourcePosition.scala similarity index 94% rename from core/src/main/scala/besom/rpc/pulumirpc/source/SourcePosition.scala rename to besom-rpc/src/main/scala/pulumirpc/source/SourcePosition.scala index 739ed828..6114be57 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/source/SourcePosition.scala +++ b/besom-rpc/src/main/scala/pulumirpc/source/SourcePosition.scala @@ -22,8 +22,8 @@ final case class SourcePosition( unknownFields: _root_.scalapb.UnknownFieldSet = _root_.scalapb.UnknownFieldSet.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[SourcePosition] { @transient - private[this] var __serializedSizeMemoized: _root_.scala.Int = 0 - private[this] def __computeSerializedSize(): _root_.scala.Int = { + private var __serializedSizeMemoized: _root_.scala.Int = 0 + private def __computeSerializedSize(): _root_.scala.Int = { var __size = 0 { @@ -157,15 +157,15 @@ object SourcePosition extends scalapb.GeneratedMessageCompanion[pulumirpc.source } def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = SourceProto.javaDescriptor.getMessageTypes().get(0) def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = SourceProto.scalaDescriptor.messages(0) - def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) - lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty - def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) + def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[?] = throw new MatchError(__number) + lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = Seq.empty + def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[?] = throw new MatchError(__fieldNumber) lazy val defaultInstance = pulumirpc.source.SourcePosition( uri = "", line = 0, column = 0 ) - implicit class SourcePositionLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.source.SourcePosition]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, pulumirpc.source.SourcePosition](_l) { + implicit class SourcePositionLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, pulumirpc.source.SourcePosition]) extends _root_.scalapb.lenses.MessageLens[UpperPB, pulumirpc.source.SourcePosition](_l) { def uri: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.uri)((c_, f_) => c_.copy(uri = f_)) def line: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.line)((c_, f_) => c_.copy(line = f_)) def column: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.column)((c_, f_) => c_.copy(column = f_)) diff --git a/core/src/main/scala/besom/rpc/pulumirpc/source/SourceProto.scala b/besom-rpc/src/main/scala/pulumirpc/source/SourceProto.scala similarity index 93% rename from core/src/main/scala/besom/rpc/pulumirpc/source/SourceProto.scala rename to besom-rpc/src/main/scala/pulumirpc/source/SourceProto.scala index 697e320e..a3623e40 100644 --- a/core/src/main/scala/besom/rpc/pulumirpc/source/SourceProto.scala +++ b/besom-rpc/src/main/scala/pulumirpc/source/SourceProto.scala @@ -7,8 +7,8 @@ package pulumirpc.source object SourceProto extends _root_.scalapb.GeneratedFileObject { lazy val dependencies: Seq[_root_.scalapb.GeneratedFileObject] = Seq.empty - lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[? <: _root_.scalapb.GeneratedMessage]]( pulumirpc.source.SourcePosition ) private lazy val ProtoBytes: _root_.scala.Array[Byte] = diff --git a/besom-zio/project.scala b/besom-zio/project.scala index a422997b..f3146a0a 100644 --- a/besom-zio/project.scala +++ b/besom-zio/project.scala @@ -15,4 +15,4 @@ //> using publish.developer "lbialy|Łukasz Biały|https://github.com/lbialy" //> using publish.developer "prolativ|Michał Pałka|https://github.com/prolativ" //> using publish.developer "KacperFKorban|Kacper Korban|https://github.com/KacperFKorban" -//> using repository sonatype:snapshots + diff --git a/besom-zio/src/main/scala/runtime.scala b/besom-zio/src/main/scala/runtime.scala index 248d8b9a..974080ea 100644 --- a/besom-zio/src/main/scala/runtime.scala +++ b/besom-zio/src/main/scala/runtime.scala @@ -49,8 +49,6 @@ trait ZIOModule extends BesomModule: zio.Runtime.default.unsafe.runToFuture(fa.uninterruptible) } - // override def run(program: Context ?=> Output[Exports]): Future[Unit] = ??? - object Pulumi extends ZIOModule export Pulumi.{component => _, *, given} @@ -72,10 +70,10 @@ import scala.reflect.Typeable * @return * The component resource. */ -def component[A <: ComponentResource & Product: RegistersOutputs: Typeable](using ctx: Context)( +def component[A <: ComponentResource & Product: RegistersOutputs: Typeable]( name: NonEmptyString, typ: ResourceType, opts: ComponentResourceOptions = ComponentResourceOptions() )( - f: Context ?=> ComponentBase ?=> A + f: ComponentBase ?=> A ): Output[A] = Pulumi.component(name, typ, opts)(f) diff --git a/codegen/resources/overlays/kubernetes/apiextensions/CustomResource.scala b/codegen/resources/overlays/kubernetes/apiextensions/CustomResource.scala index 385195ca..51a1a4d0 100644 --- a/codegen/resources/overlays/kubernetes/apiextensions/CustomResource.scala +++ b/codegen/resources/overlays/kubernetes/apiextensions/CustomResource.scala @@ -10,11 +10,11 @@ final case class CustomResource[A] private ( ) extends besom.CustomResource object CustomResource: - def apply[A: besom.types.Encoder: besom.types.Decoder](using ctx: besom.types.Context)( + def apply[A: besom.types.Encoder: besom.types.Decoder]( name: besom.util.NonEmptyString, args: CustomResourceArgs[A], opts: besom.ResourceOptsVariant.Component ?=> besom.ComponentResourceOptions = besom.ComponentResourceOptions() - ): besom.types.Output[CustomResource[A]] = { + ): besom.types.Output[CustomResource[A]] = besom.internal.Output.getContext.flatMap { implicit ctx => val resourceName = besom.types.ResourceType.unsafeOf(s"kubernetes:${args.apiVersion}:${args.kind}") given besom.types.ResourceDecoder[CustomResource[A]] = besom.internal.ResourceDecoder.derived[CustomResource[A]] given besom.types.Decoder[CustomResource[A]] = besom.internal.Decoder.customResourceDecoder[CustomResource[A]] diff --git a/codegen/resources/overlays/kubernetes/apiextensions/CustomResourceArgs.scala b/codegen/resources/overlays/kubernetes/apiextensions/CustomResourceArgs.scala index 1f4ce407..193b137e 100644 --- a/codegen/resources/overlays/kubernetes/apiextensions/CustomResourceArgs.scala +++ b/codegen/resources/overlays/kubernetes/apiextensions/CustomResourceArgs.scala @@ -13,7 +13,7 @@ object CustomResourceArgs: kind: String, metadata: besom.types.Input.Optional[besom.api.kubernetes.meta.v1.inputs.ObjectMetaArgs] = scala.None, spec: besom.types.Input[A] - )(using besom.types.Context): CustomResourceArgs[A] = + ): CustomResourceArgs[A] = new CustomResourceArgs( apiVersion = apiVersion, kind = kind, @@ -27,7 +27,7 @@ object CustomResourceArgs: kind: String = customResourceArgs.kind, metadata: besom.types.Input.Optional[besom.api.kubernetes.meta.v1.inputs.ObjectMetaArgs] = customResourceArgs.metadata, spec: besom.types.Input[A] = customResourceArgs.spec - )(using besom.types.Context): CustomResourceArgs[A] = + ): CustomResourceArgs[A] = new CustomResourceArgs( apiVersion = apiVersion, kind = kind, diff --git a/codegen/resources/overlays/kubernetes/apiextensions/CustomResourcePatch.scala b/codegen/resources/overlays/kubernetes/apiextensions/CustomResourcePatch.scala index 1a2bc236..8ed6d8e1 100644 --- a/codegen/resources/overlays/kubernetes/apiextensions/CustomResourcePatch.scala +++ b/codegen/resources/overlays/kubernetes/apiextensions/CustomResourcePatch.scala @@ -10,11 +10,11 @@ final case class CustomResourcePatch[A] private ( ) extends besom.CustomResource object CustomResourcePatch: - def apply[A: besom.types.Encoder: besom.types.Decoder](using ctx: besom.types.Context)( + def apply[A: besom.types.Encoder: besom.types.Decoder]( name: besom.util.NonEmptyString, args: CustomResourcePatchArgs[A], opts: besom.ResourceOptsVariant.Component ?=> besom.ComponentResourceOptions = besom.ComponentResourceOptions() - ): besom.types.Output[CustomResourcePatch[A]] = { + ): besom.types.Output[CustomResourcePatch[A]] = besom.internal.Output.getContext.flatMap { implicit ctx => val resourceName = besom.types.ResourceType.unsafeOf(s"kubernetes:${args.apiVersion}:${args.kind}") given besom.types.ResourceDecoder[CustomResourcePatch[A]] = besom.internal.ResourceDecoder.derived[CustomResourcePatch[A]] given besom.types.Decoder[CustomResourcePatch[A]] = besom.internal.Decoder.customResourceDecoder[CustomResourcePatch[A]] diff --git a/codegen/resources/overlays/kubernetes/apiextensions/CustomResourcePatchArgs.scala b/codegen/resources/overlays/kubernetes/apiextensions/CustomResourcePatchArgs.scala index 6f365d2b..a48c250f 100644 --- a/codegen/resources/overlays/kubernetes/apiextensions/CustomResourcePatchArgs.scala +++ b/codegen/resources/overlays/kubernetes/apiextensions/CustomResourcePatchArgs.scala @@ -13,7 +13,7 @@ object CustomResourcePatchArgs: kind: String, metadata: besom.types.Input.Optional[besom.api.kubernetes.meta.v1.inputs.ObjectMetaPatchArgs] = scala.None, spec: besom.types.Input.Optional[A] = scala.None - )(using besom.types.Context): CustomResourcePatchArgs[A] = + ): CustomResourcePatchArgs[A] = new CustomResourcePatchArgs( apiVersion = apiVersion, kind = kind, @@ -27,7 +27,7 @@ object CustomResourcePatchArgs: kind: String = customResourcePatchArgs.kind, metadata: besom.types.Input.Optional[besom.api.kubernetes.meta.v1.inputs.ObjectMetaPatchArgs] = customResourcePatchArgs.metadata, spec: besom.types.Input.Optional[A] = customResourcePatchArgs.spec - )(using besom.types.Context): CustomResourcePatchArgs[A] = + ): CustomResourcePatchArgs[A] = new CustomResourcePatchArgs( apiVersion = apiVersion, kind = kind, diff --git a/codegen/src/CodeGen.scala b/codegen/src/CodeGen.scala index 5e2cc1f1..2cbdf17f 100644 --- a/codegen/src/CodeGen.scala +++ b/codegen/src/CodeGen.scala @@ -466,11 +466,12 @@ class CodeGen(using val thisTypeRef = baseClassCoordinates.typeRef val tokenLiteral = Lit.String(functionToken.asString) val code = - m"""| def ${Term.Name(name)}(using ctx: besom.types.Context)( + m"""| def ${Term.Name(name)}( | args: ${argsClassRef}${argsDefault}, | opts: besom.InvokeOptions = besom.InvokeOptions() - | ): besom.types.Output[${resultTypeRef}] = + | ): besom.types.Output[${resultTypeRef}] = besom.internal.Output.getContext.flatMap { implicit ctx => | ctx.call[$argsClassRef, $resultTypeRef, $thisTypeRef](${tokenLiteral}, args, this, opts) + | } |""".stripMargin.parse[Stat].get (supportClassSourceFiles, code) @@ -490,14 +491,14 @@ class CodeGen(using val tokenLit = Lit.String(token.asString) val resourceDecoderInstance = - m""" given resourceDecoder(using besom.types.Context): besom.types.ResourceDecoder[$baseClassName] = + m""" given resourceDecoder: besom.types.ResourceDecoder[$baseClassName] = | besom.internal.ResourceDecoder.derived[$baseClassName] |""".stripMargin val decoderInstanceName = if isRemoteComponent then "remoteComponentResourceDecoder" else "customResourceDecoder" val decoderInstance = - m""" given decoder(using besom.types.Context): besom.types.Decoder[$baseClassName] = + m""" given decoder: besom.types.Decoder[$baseClassName] = | besom.internal.Decoder.$decoderInstanceName[$baseClassName] |""".stripMargin @@ -528,12 +529,13 @@ class CodeGen(using | * ) | * }}} | */ - | def apply(using ctx: besom.types.Context)( + | def apply( | name: besom.util.NonEmptyString, | args: ${argsClassName}${argsDefault}, | opts: besom.ResourceOptsVariant.$variant ?=> ${resourceOptsClass} = ${resourceOptsClass}() - | ): besom.types.Output[$baseClassName] = + | ): besom.types.Output[$baseClassName] = besom.internal.Output.getContext.flatMap { implicit ctx => | ctx.${resourceRegisterMethodName}[$baseClassName, $argsClassName](${tokenLit}, name, args, opts(using besom.ResourceOptsVariant.$variant)) + | } | | private[besom] def typeToken: besom.types.ResourceType = ${tokenLit} | @@ -685,11 +687,12 @@ class CodeGen(using val fileContent = s"""|package ${methodCoordinates.packageRef} | - |def ${Name(methodName)}(using ctx: besom.types.Context)( + |def ${Name(methodName)}( | args: ${argsClassRef}${argsDefault}, | opts: besom.InvokeOptions = besom.InvokeOptions() - |): besom.types.Output[${resultTypeRef}] = + |): besom.types.Output[${resultTypeRef}] = besom.internal.Output.getContext.flatMap { implicit ctx => | ctx.invoke[$argsClassRef, $resultTypeRef](${token}, args, opts) + |} |""".stripMargin SourceFile(filePath = methodCoordinates.filePath, sourceCode = fileContent) @@ -745,10 +748,7 @@ class CodeGen(using | * ${description}${deprecationDocs} | * ${returnsDoc} | */${deprecationCode} - |def ${get}(using ${scalameta.types.besom.types.Context}): ${scalameta.types.besom.types - .Output( - scalameta.types.Option(propType) - )} = + |def ${get}: ${scalameta.types.besom.types.Output(scalameta.types.Option(propType))} = | besom.internal.Codegen.config[${propType}](${providerNameLit})(key = ${configNameLit}, isSecret = ${isSecret}, default = ${default}, environment = ${environment}) |""".stripMargin @@ -852,7 +852,7 @@ class CodeGen(using val _ = scalameta.parseStatement(classDef) val decoderInstance = - m"""| given decoder(using besom.types.Context): besom.types.Decoder[$className] = + m"""| given decoder: besom.types.Decoder[$className] = | besom.internal.Decoder.derived[$className] |""".stripMargin @@ -1017,25 +1017,25 @@ class CodeGen(using val derivedTypeclasses = { lazy val providerArgsEncoderInstance = - m"""| given providerArgsEncoder(using besom.types.Context): besom.types.ProviderArgsEncoder[$argsClassName] = + m"""| given providerArgsEncoder: besom.types.ProviderArgsEncoder[$argsClassName] = | besom.internal.ProviderArgsEncoder.derived[$argsClassName] |""".stripMargin lazy val argsEncoderInstance = - m"""| given argsEncoder(using besom.types.Context): besom.types.ArgsEncoder[$argsClassName] = + m"""| given argsEncoder: besom.types.ArgsEncoder[$argsClassName] = | besom.internal.ArgsEncoder.derived[$argsClassName] |""".stripMargin if (isProvider) - m"""| given encoder(using besom.types.Context): besom.types.Encoder[$argsClassName] = + m"""| given encoder: besom.types.Encoder[$argsClassName] = | besom.internal.Encoder.derived[$argsClassName] |$providerArgsEncoderInstance""".stripMargin else if (isResource) - m"""| given encoder(using besom.types.Context): besom.types.Encoder[$argsClassName] = + m"""| given encoder: besom.types.Encoder[$argsClassName] = | besom.internal.Encoder.derived[$argsClassName] |$argsEncoderInstance""".stripMargin else - m"""| given encoder(using besom.types.Context): besom.types.Encoder[$argsClassName] = + m"""| given encoder: besom.types.Encoder[$argsClassName] = | besom.internal.Encoder.derived[$argsClassName] |$argsEncoderInstance""".stripMargin } @@ -1043,14 +1043,14 @@ class CodeGen(using m"""|object $argsClassName: | def apply( |${argsCompanionApplyParams.map(arg => s" ${arg.syntax}").mkString(",\n")} - | )(using besom.types.Context): $argsClassName = + | ): $argsClassName = | new $argsClassName( |${argsCompanionApplyBodyArgs.map(arg => s" ${arg.syntax}").mkString(",\n")} | ) | | extension (${argsClassInstanceName}: ${argsClassName}) def withArgs( |${argsCompanionWithArgsParams.map(arg => s" ${arg.syntax}").mkString(",\n")} - | )(using besom.types.Context): $argsClassName = + | ): $argsClassName = | new $argsClassName( |${argsCompanionApplyBodyArgs.map(arg => s" ${arg.syntax}").mkString(",\n")} | ) @@ -1074,7 +1074,7 @@ class CodeGen(using Term.Tuple(List(keyLit, decoder)) }.toList) val name = decoderUniqueName(unionType) - name -> m"""| given ${name}(using besom.types.Context): besom.types.Decoder[$unionType] = + name -> m"""| given ${name}: besom.types.Decoder[$unionType] = | besom.internal.Decoder.discriminated($keyPropertyNameLit, $indexesLit) |""".stripMargin case TypeMapper.UnionMapping.ByIndex(unionType, indexToType) => @@ -1084,7 +1084,7 @@ class CodeGen(using Term.Tuple(List(keyLit, decoder)) }.toList) val name = decoderUniqueName(unionType) - name -> m"""| given ${name}(using besom.types.Context): besom.types.Decoder[$unionType] = + name -> m"""| given ${name}: besom.types.Decoder[$unionType] = | besom.internal.Decoder.nonDiscriminated($indexesLit) |""".stripMargin } diff --git a/codegen/src/CodeGen.test.scala b/codegen/src/CodeGen.test.scala index a5112857..1ac555ef 100644 --- a/codegen/src/CodeGen.test.scala +++ b/codegen/src/CodeGen.test.scala @@ -94,19 +94,20 @@ class CodeGenTest extends munit.FunSuite { | * ) | * }}} | */ - | def apply(using ctx: besom.types.Context)( + | def apply( | name: besom.util.NonEmptyString, | args: ProviderArgs = ProviderArgs(), | opts: besom.ResourceOptsVariant.Custom ?=> besom.CustomResourceOptions = besom.CustomResourceOptions() - | ): besom.types.Output[Provider] = + | ): besom.types.Output[Provider] = besom.internal.Output.getContext.flatMap { implicit ctx => | ctx.readOrRegisterResource[Provider, ProviderArgs]("pulumi:providers:example", name, args, opts(using besom.ResourceOptsVariant.Custom)) + | } | | private[besom] def typeToken: besom.types.ResourceType = "pulumi:providers:example" | - | given resourceDecoder(using besom.types.Context): besom.types.ResourceDecoder[Provider] = + | given resourceDecoder: besom.types.ResourceDecoder[Provider] = | besom.internal.ResourceDecoder.derived[Provider] | - | given decoder(using besom.types.Context): besom.types.Decoder[Provider] = + | given decoder: besom.types.Decoder[Provider] = | besom.internal.Decoder.customResourceDecoder[Provider] | | @@ -125,21 +126,21 @@ class CodeGenTest extends munit.FunSuite { |object ProviderArgs: | def apply( | helmReleaseSettings: besom.types.Input.Optional[besom.api.example.inputs.HelmReleaseSettingsArgs] = scala.None - | )(using besom.types.Context): ProviderArgs = + | ): ProviderArgs = | new ProviderArgs( | helmReleaseSettings = helmReleaseSettings.asOptionOutput(isSecret = false) | ) | | extension (providerArgs: ProviderArgs) def withArgs( | helmReleaseSettings: besom.types.Input.Optional[besom.api.example.inputs.HelmReleaseSettingsArgs] = providerArgs.helmReleaseSettings - | )(using besom.types.Context): ProviderArgs = + | ): ProviderArgs = | new ProviderArgs( | helmReleaseSettings = helmReleaseSettings.asOptionOutput(isSecret = false) | ) | - | given encoder(using besom.types.Context): besom.types.Encoder[ProviderArgs] = + | given encoder: besom.types.Encoder[ProviderArgs] = | besom.internal.Encoder.derived[ProviderArgs] - | given providerArgsEncoder(using besom.types.Context): besom.types.ProviderArgsEncoder[ProviderArgs] = + | given providerArgsEncoder: besom.types.ProviderArgsEncoder[ProviderArgs] = | besom.internal.ProviderArgsEncoder.derived[ProviderArgs] |""".stripMargin ), @@ -223,11 +224,12 @@ class CodeGenTest extends munit.FunSuite { | id: besom.types.Output[besom.types.ResourceId], | name: besom.types.Output[String] |) extends besom.CustomResource: - | def getKubeconfig(using ctx: besom.types.Context)( + | def getKubeconfig( | args: besom.api.googlenative.container.v1.ClusterGetKubeconfigArgs = besom.api.googlenative.container.v1.ClusterGetKubeconfigArgs(), | opts: besom.InvokeOptions = besom.InvokeOptions() - | ): besom.types.Output[besom.api.googlenative.container.v1.ClusterGetKubeconfigResult] = + | ): besom.types.Output[besom.api.googlenative.container.v1.ClusterGetKubeconfigResult] = besom.internal.Output.getContext.flatMap { implicit ctx => | ctx.call[besom.api.googlenative.container.v1.ClusterGetKubeconfigArgs, besom.api.googlenative.container.v1.ClusterGetKubeconfigResult, besom.api.googlenative.container.v1.Cluster]("google-native:container/v1:Cluster/getKubeconfig", args, this, opts) + | } | |object Cluster extends besom.ResourceCompanion[Cluster]: | /** Resource constructor for Cluster. @@ -250,19 +252,20 @@ class CodeGenTest extends munit.FunSuite { | * ) | * }}} | */ - | def apply(using ctx: besom.types.Context)( + | def apply( | name: besom.util.NonEmptyString, | args: ClusterArgs = ClusterArgs(), | opts: besom.ResourceOptsVariant.Custom ?=> besom.CustomResourceOptions = besom.CustomResourceOptions() - | ): besom.types.Output[Cluster] = + | ): besom.types.Output[Cluster] = besom.internal.Output.getContext.flatMap { implicit ctx => | ctx.readOrRegisterResource[Cluster, ClusterArgs]("google-native:container/v1:Cluster", name, args, opts(using besom.ResourceOptsVariant.Custom)) + | } | | private[besom] def typeToken: besom.types.ResourceType = "google-native:container/v1:Cluster" | - | given resourceDecoder(using besom.types.Context): besom.types.ResourceDecoder[Cluster] = + | given resourceDecoder: besom.types.ResourceDecoder[Cluster] = | besom.internal.ResourceDecoder.derived[Cluster] | - | given decoder(using besom.types.Context): besom.types.Decoder[Cluster] = + | given decoder: besom.types.Decoder[Cluster] = | besom.internal.Decoder.customResourceDecoder[Cluster] | | @@ -282,21 +285,21 @@ class CodeGenTest extends munit.FunSuite { |object ClusterArgs: | def apply( | - | )(using besom.types.Context): ClusterArgs = + | ): ClusterArgs = | new ClusterArgs( | | ) | | extension (clusterArgs: ClusterArgs) def withArgs( | - | )(using besom.types.Context): ClusterArgs = + | ): ClusterArgs = | new ClusterArgs( | | ) | - | given encoder(using besom.types.Context): besom.types.Encoder[ClusterArgs] = + | given encoder: besom.types.Encoder[ClusterArgs] = | besom.internal.Encoder.derived[ClusterArgs] - | given argsEncoder(using besom.types.Context): besom.types.ArgsEncoder[ClusterArgs] = + | given argsEncoder: besom.types.ArgsEncoder[ClusterArgs] = | besom.internal.ArgsEncoder.derived[ClusterArgs] |""".stripMargin, "src/container/v1/ClusterGetKubeconfigArgs.scala" -> @@ -309,21 +312,21 @@ class CodeGenTest extends munit.FunSuite { |object ClusterGetKubeconfigArgs: | def apply( | - | )(using besom.types.Context): ClusterGetKubeconfigArgs = + | ): ClusterGetKubeconfigArgs = | new ClusterGetKubeconfigArgs( | | ) | | extension (clusterGetKubeconfigArgs: ClusterGetKubeconfigArgs) def withArgs( | - | )(using besom.types.Context): ClusterGetKubeconfigArgs = + | ): ClusterGetKubeconfigArgs = | new ClusterGetKubeconfigArgs( | | ) | - | given encoder(using besom.types.Context): besom.types.Encoder[ClusterGetKubeconfigArgs] = + | given encoder: besom.types.Encoder[ClusterGetKubeconfigArgs] = | besom.internal.Encoder.derived[ClusterGetKubeconfigArgs] - | given argsEncoder(using besom.types.Context): besom.types.ArgsEncoder[ClusterGetKubeconfigArgs] = + | given argsEncoder: besom.types.ArgsEncoder[ClusterGetKubeconfigArgs] = | besom.internal.ArgsEncoder.derived[ClusterGetKubeconfigArgs] |""".stripMargin, "src/container/v1/ClusterGetKubeconfigResult.scala" -> @@ -335,7 +338,7 @@ class CodeGenTest extends munit.FunSuite { |) |object ClusterGetKubeconfigResult : | - | given decoder(using besom.types.Context): besom.types.Decoder[ClusterGetKubeconfigResult] = + | given decoder: besom.types.Decoder[ClusterGetKubeconfigResult] = | besom.internal.Decoder.derived[ClusterGetKubeconfigResult] | | @@ -351,11 +354,12 @@ class CodeGenTest extends munit.FunSuite { "src/container/v1/getCluster.scala" -> """|package besom.api.googlenative.container.v1 | - |def getCluster(using ctx: besom.types.Context)( + |def getCluster( | args: besom.api.googlenative.container.v1.GetClusterArgs, | opts: besom.InvokeOptions = besom.InvokeOptions() - |): besom.types.Output[scala.Unit] = + |): besom.types.Output[scala.Unit] = besom.internal.Output.getContext.flatMap { implicit ctx => | ctx.invoke[besom.api.googlenative.container.v1.GetClusterArgs, scala.Unit]("google-native:container/v1:getCluster", args, opts) + |} |""".stripMargin, "src/container/v1/GetClusterArgs.scala" -> """|package besom.api.googlenative.container.v1 @@ -369,7 +373,7 @@ class CodeGenTest extends munit.FunSuite { | def apply( | clusterId: besom.types.Input[String], | location: besom.types.Input.Optional[String] = scala.None - | )(using besom.types.Context): GetClusterArgs = + | ): GetClusterArgs = | new GetClusterArgs( | clusterId = clusterId.asOutput(isSecret = false), | location = location.asOptionOutput(isSecret = false) @@ -378,15 +382,15 @@ class CodeGenTest extends munit.FunSuite { | extension (getClusterArgs: GetClusterArgs) def withArgs( | clusterId: besom.types.Input[String] = getClusterArgs.clusterId, | location: besom.types.Input.Optional[String] = getClusterArgs.location - | )(using besom.types.Context): GetClusterArgs = + | ): GetClusterArgs = | new GetClusterArgs( | clusterId = clusterId.asOutput(isSecret = false), | location = location.asOptionOutput(isSecret = false) | ) | - | given encoder(using besom.types.Context): besom.types.Encoder[GetClusterArgs] = + | given encoder: besom.types.Encoder[GetClusterArgs] = | besom.internal.Encoder.derived[GetClusterArgs] - | given argsEncoder(using besom.types.Context): besom.types.ArgsEncoder[GetClusterArgs] = + | given argsEncoder: besom.types.ArgsEncoder[GetClusterArgs] = | besom.internal.ArgsEncoder.derived[GetClusterArgs] |""".stripMargin ), @@ -470,21 +474,21 @@ class CodeGenTest extends munit.FunSuite { |object MultipleActivationKeyArgs: | def apply( | supportType: besom.types.Input[String | besom.api.azurenative.windowsesu.enums.SupportType] = "SupplementalServicing" - | )(using besom.types.Context): MultipleActivationKeyArgs = + | ): MultipleActivationKeyArgs = | new MultipleActivationKeyArgs( | supportType = supportType.asOutput(isSecret = false) | ) | | extension (multipleActivationKeyArgs: MultipleActivationKeyArgs) def withArgs( | supportType: besom.types.Input[String | besom.api.azurenative.windowsesu.enums.SupportType] = multipleActivationKeyArgs.supportType - | )(using besom.types.Context): MultipleActivationKeyArgs = + | ): MultipleActivationKeyArgs = | new MultipleActivationKeyArgs( | supportType = supportType.asOutput(isSecret = false) | ) | - | given encoder(using besom.types.Context): besom.types.Encoder[MultipleActivationKeyArgs] = + | given encoder: besom.types.Encoder[MultipleActivationKeyArgs] = | besom.internal.Encoder.derived[MultipleActivationKeyArgs] - | given argsEncoder(using besom.types.Context): besom.types.ArgsEncoder[MultipleActivationKeyArgs] = + | given argsEncoder: besom.types.ArgsEncoder[MultipleActivationKeyArgs] = | besom.internal.ArgsEncoder.derived[MultipleActivationKeyArgs] |""".stripMargin ) @@ -558,21 +562,21 @@ class CodeGenTest extends munit.FunSuite { |object JobDefinitionArgs: | def apply( | userConfirmation: besom.types.Input[besom.api.azurenative.hybriddata.enums.UserConfirmation] = besom.api.azurenative.hybriddata.enums.UserConfirmation.NotRequired - | )(using besom.types.Context): JobDefinitionArgs = + | ): JobDefinitionArgs = | new JobDefinitionArgs( | userConfirmation = userConfirmation.asOutput(isSecret = false) | ) | | extension (jobDefinitionArgs: JobDefinitionArgs) def withArgs( | userConfirmation: besom.types.Input[besom.api.azurenative.hybriddata.enums.UserConfirmation] = jobDefinitionArgs.userConfirmation - | )(using besom.types.Context): JobDefinitionArgs = + | ): JobDefinitionArgs = | new JobDefinitionArgs( | userConfirmation = userConfirmation.asOutput(isSecret = false) | ) | - | given encoder(using besom.types.Context): besom.types.Encoder[JobDefinitionArgs] = + | given encoder: besom.types.Encoder[JobDefinitionArgs] = | besom.internal.Encoder.derived[JobDefinitionArgs] - | given argsEncoder(using besom.types.Context): besom.types.ArgsEncoder[JobDefinitionArgs] = + | given argsEncoder: besom.types.ArgsEncoder[JobDefinitionArgs] = | besom.internal.ArgsEncoder.derived[JobDefinitionArgs] |""".stripMargin ) @@ -665,7 +669,7 @@ class CodeGenTest extends munit.FunSuite { | def apply( | brightness: besom.types.Input[besom.api.plant.enums.ContainerBrightness] = besom.api.plant.enums.ContainerBrightness.One, | size: besom.types.Input[besom.api.plant.enums.ContainerSize] = besom.api.plant.enums.ContainerSize.FourInch - | )(using besom.types.Context): ContainerArgs = + | ): ContainerArgs = | new ContainerArgs( | brightness = brightness.asOutput(isSecret = false), | size = size.asOutput(isSecret = false) @@ -674,15 +678,15 @@ class CodeGenTest extends munit.FunSuite { | extension (containerArgs: ContainerArgs) def withArgs( | brightness: besom.types.Input[besom.api.plant.enums.ContainerBrightness] = containerArgs.brightness, | size: besom.types.Input[besom.api.plant.enums.ContainerSize] = containerArgs.size - | )(using besom.types.Context): ContainerArgs = + | ): ContainerArgs = | new ContainerArgs( | brightness = brightness.asOutput(isSecret = false), | size = size.asOutput(isSecret = false) | ) | - | given encoder(using besom.types.Context): besom.types.Encoder[ContainerArgs] = + | given encoder: besom.types.Encoder[ContainerArgs] = | besom.internal.Encoder.derived[ContainerArgs] - | given argsEncoder(using besom.types.Context): besom.types.ArgsEncoder[ContainerArgs] = + | given argsEncoder: besom.types.ArgsEncoder[ContainerArgs] = | besom.internal.ArgsEncoder.derived[ContainerArgs] |""".stripMargin ) @@ -741,7 +745,7 @@ class CodeGenTest extends munit.FunSuite { |) |object EniConfig : | - | given decoder(using besom.types.Context): besom.types.Decoder[EniConfig] = + | given decoder: besom.types.Decoder[EniConfig] = | besom.internal.Decoder.derived[EniConfig] | | @@ -773,7 +777,7 @@ class CodeGenTest extends munit.FunSuite { |object EniConfigArgs: | def apply( | spec: besom.types.Input.Optional[besom.api.kubernetes.crdk8samazonawscom.v1alpha1.inputs.EniConfigSpecArgs] = scala.None - | )(using besom.types.Context): EniConfigArgs = + | ): EniConfigArgs = | new EniConfigArgs( | apiVersion = besom.types.Output("crd.k8s.amazonaws.com/v1alpha1"), | kind = besom.types.Output("ENIConfig"), @@ -782,16 +786,16 @@ class CodeGenTest extends munit.FunSuite { | | extension (eniConfigArgs: EniConfigArgs) def withArgs( | spec: besom.types.Input.Optional[besom.api.kubernetes.crdk8samazonawscom.v1alpha1.inputs.EniConfigSpecArgs] = eniConfigArgs.spec - | )(using besom.types.Context): EniConfigArgs = + | ): EniConfigArgs = | new EniConfigArgs( | apiVersion = besom.types.Output("crd.k8s.amazonaws.com/v1alpha1"), | kind = besom.types.Output("ENIConfig"), | spec = spec.asOptionOutput(isSecret = false) | ) | - | given encoder(using besom.types.Context): besom.types.Encoder[EniConfigArgs] = + | given encoder: besom.types.Encoder[EniConfigArgs] = | besom.internal.Encoder.derived[EniConfigArgs] - | given argsEncoder(using besom.types.Context): besom.types.ArgsEncoder[EniConfigArgs] = + | given argsEncoder: besom.types.ArgsEncoder[EniConfigArgs] = | besom.internal.ArgsEncoder.derived[EniConfigArgs] | | @@ -806,7 +810,7 @@ class CodeGenTest extends munit.FunSuite { |) |object EniConfigSpec : | - | given decoder(using besom.types.Context): besom.types.Decoder[EniConfigSpec] = + | given decoder: besom.types.Decoder[EniConfigSpec] = | besom.internal.Decoder.derived[EniConfigSpec] | | @@ -836,7 +840,7 @@ class CodeGenTest extends munit.FunSuite { | def apply( | securityGroups: besom.types.Input.Optional[scala.collection.immutable.Iterable[besom.types.Input[String]]] = scala.None, | subnet: besom.types.Input.Optional[String] = scala.None - | )(using besom.types.Context): EniConfigSpecArgs = + | ): EniConfigSpecArgs = | new EniConfigSpecArgs( | securityGroups = securityGroups.asOptionOutput(isSecret = false), | subnet = subnet.asOptionOutput(isSecret = false) @@ -845,15 +849,15 @@ class CodeGenTest extends munit.FunSuite { | extension (eniConfigSpecArgs: EniConfigSpecArgs) def withArgs( | securityGroups: besom.types.Input.Optional[scala.collection.immutable.Iterable[besom.types.Input[String]]] = eniConfigSpecArgs.securityGroups, | subnet: besom.types.Input.Optional[String] = eniConfigSpecArgs.subnet - | )(using besom.types.Context): EniConfigSpecArgs = + | ): EniConfigSpecArgs = | new EniConfigSpecArgs( | securityGroups = securityGroups.asOptionOutput(isSecret = false), | subnet = subnet.asOptionOutput(isSecret = false) | ) | - | given encoder(using besom.types.Context): besom.types.Encoder[EniConfigSpecArgs] = + | given encoder: besom.types.Encoder[EniConfigSpecArgs] = | besom.internal.Encoder.derived[EniConfigSpecArgs] - | given argsEncoder(using besom.types.Context): besom.types.ArgsEncoder[EniConfigSpecArgs] = + | given argsEncoder: besom.types.ArgsEncoder[EniConfigSpecArgs] = | besom.internal.ArgsEncoder.derived[EniConfigSpecArgs] |""".stripMargin ) @@ -920,19 +924,20 @@ class CodeGenTest extends munit.FunSuite { | * ) | * }}} | */ - | def apply(using ctx: besom.types.Context)( + | def apply( | name: besom.util.NonEmptyString, | args: ProviderArgs, | opts: besom.ResourceOptsVariant.Custom ?=> besom.CustomResourceOptions = besom.CustomResourceOptions() - | ): besom.types.Output[Provider] = + | ): besom.types.Output[Provider] = besom.internal.Output.getContext.flatMap { implicit ctx => | ctx.readOrRegisterResource[Provider, ProviderArgs]("pulumi:providers:example", name, args, opts(using besom.ResourceOptsVariant.Custom)) + | } | | private[besom] def typeToken: besom.types.ResourceType = "pulumi:providers:example" | - | given resourceDecoder(using besom.types.Context): besom.types.ResourceDecoder[Provider] = + | given resourceDecoder: besom.types.ResourceDecoder[Provider] = | besom.internal.ResourceDecoder.derived[Provider] | - | given decoder(using besom.types.Context): besom.types.Decoder[Provider] = + | given decoder: besom.types.Decoder[Provider] = | besom.internal.Decoder.customResourceDecoder[Provider] | | @@ -956,7 +961,7 @@ class CodeGenTest extends munit.FunSuite { | plainOptionalString: scala.Option[String] = scala.None, | plainOptionalStringWithDefault: String = "another", | plainRequiredString: String - | )(using besom.types.Context): ProviderArgs = + | ): ProviderArgs = | new ProviderArgs( | plainConst = "val", | plainOptionalString = plainOptionalString, @@ -968,7 +973,7 @@ class CodeGenTest extends munit.FunSuite { | plainOptionalString: scala.Option[String] = providerArgs.plainOptionalString, | plainOptionalStringWithDefault: String = providerArgs.plainOptionalStringWithDefault, | plainRequiredString: String = providerArgs.plainRequiredString - | )(using besom.types.Context): ProviderArgs = + | ): ProviderArgs = | new ProviderArgs( | plainConst = "val", | plainOptionalString = plainOptionalString, @@ -976,9 +981,9 @@ class CodeGenTest extends munit.FunSuite { | plainRequiredString = plainRequiredString | ) | - | given encoder(using besom.types.Context): besom.types.Encoder[ProviderArgs] = + | given encoder: besom.types.Encoder[ProviderArgs] = | besom.internal.Encoder.derived[ProviderArgs] - | given providerArgsEncoder(using besom.types.Context): besom.types.ProviderArgsEncoder[ProviderArgs] = + | given providerArgsEncoder: besom.types.ProviderArgsEncoder[ProviderArgs] = | besom.internal.ProviderArgsEncoder.derived[ProviderArgs] |""".stripMargin ) @@ -1104,19 +1109,20 @@ class CodeGenTest extends munit.FunSuite { | * ) | * }}} | */ - | def apply(using ctx: besom.types.Context)( + | def apply( | name: besom.util.NonEmptyString, | args: MangledArgs = MangledArgs(), | opts: besom.ResourceOptsVariant.Custom ?=> besom.CustomResourceOptions = besom.CustomResourceOptions() - | ): besom.types.Output[Mangled] = + | ): besom.types.Output[Mangled] = besom.internal.Output.getContext.flatMap { implicit ctx => | ctx.readOrRegisterResource[Mangled, MangledArgs]("mangled-provider:index:mangled", name, args, opts(using besom.ResourceOptsVariant.Custom)) + | } | | private[besom] def typeToken: besom.types.ResourceType = "mangled-provider:index:mangled" | - | given resourceDecoder(using besom.types.Context): besom.types.ResourceDecoder[Mangled] = + | given resourceDecoder: besom.types.ResourceDecoder[Mangled] = | besom.internal.ResourceDecoder.derived[Mangled] | - | given decoder(using besom.types.Context): besom.types.Decoder[Mangled] = + | given decoder: besom.types.Decoder[Mangled] = | besom.internal.Decoder.customResourceDecoder[Mangled] | | diff --git a/codegen/src/scalameta.scala b/codegen/src/scalameta.scala index 368d0b73..2e57be21 100644 --- a/codegen/src/scalameta.scala +++ b/codegen/src/scalameta.scala @@ -96,8 +96,6 @@ object scalameta: object besom { // noinspection TypeAnnotation object types { - val Context: Type.Ref = Type.Select(Term.Select(Term.Name("besom"), Term.Name("types")), Type.Name("Context")) - def Output(a: Type): Type = Type.Apply(Type.Select(Term.Select(Term.Name("besom"), Term.Name("types")), Type.Name("Output")), Type.ArgClause(a :: Nil)) def Input(a: Type): Type = diff --git a/core/project.scala b/core/project.scala index bb059e7c..41eb30b5 100644 --- a/core/project.scala +++ b/core/project.scala @@ -4,6 +4,8 @@ // -language:noAutoTupling // after https://github.com/VirtusLab/scala-cli/issues/2708 //> using dep "org.virtuslab::besom-json:0.4.0-SNAPSHOT" +//> using dep "org.virtuslab::besom-rpc:0.4.0-SNAPSHOT" + //> using dep "com.google.protobuf:protobuf-java-util:3.25.1" //> using dep "io.grpc:grpc-netty:1.64.0" //> using dep "io.netty:netty-transport-native-kqueue:4.1.100.Final" @@ -27,4 +29,4 @@ //> using publish.developer "prolativ|Michał Pałka|https://github.com/prolativ" //> using publish.developer "KacperFKorban|Kacper Korban|https://github.com/KacperFKorban" //> using publish.developer "pawelprazak|Paweł Prażak|https://github.com/pawelprazak" -//> using repository sonatype:snapshots + diff --git a/core/src/main/scala/besom/future.scala b/core/src/main/scala/besom/future.scala index 1730ede0..c6b43c92 100644 --- a/core/src/main/scala/besom/future.scala +++ b/core/src/main/scala/besom/future.scala @@ -8,7 +8,7 @@ import scala.concurrent.* trait FutureMonadModule extends BesomModule: override final type Eff[+A] = scala.concurrent.Future[A] given ExecutionContext = ExecutionContext.fromExecutorService( - null, // FJP does seem to swallow fatals + null, // global Future EC reports fatals and uncaught exceptions to stderr, we want to quit on fatals (t: Throwable) => // TODO this has to contain a link to github issue tracker to allow user to easily create a bug report, this is EXTREMELY IMPORTANT scribe.error("Uncaught fatal error in Future Runtime", t) @@ -22,18 +22,27 @@ trait FutureMonadModule extends BesomModule: /** Besom API entry point for the [[scala.concurrent.Future]] monad. * - * All Pulumi programs are executed in Besom context [[besom.Context]] - * - * Most notable methods exposed by [[besom.Pulumi]] are: - * - [[besom.internal.BesomModule.run]] - the Pulumi program function - * - [[besom.internal.BesomSyntax.config]] - configuration and secrets + * `Pulumi.run` is the entry point for your Pulumi program. Inside the `Pulumi.run` a `besom.Context` is available, which is used by + * methods that provide metadata about the current Pulumi stack. These methods are: + * - [[besom.internal.BesomSyntax.isDryRun]] - is the current run a dry run (planning instead of deployment) + * - [[besom.internal.BesomSyntax.config]] - provides access to the configuration and secrets * - [[besom.internal.BesomSyntax.log]] - all your logging needs + * - [[besom.internal.BesomSyntax.urn]] - the URN of the current Pulumi stack + * - [[besom.internal.BesomSyntax.pulumiOrganization]] - the organization of the current Pulumi stack + * - [[besom.internal.BesomSyntax.pulumiProject]] - the project name of the current Pulumi stack + * - [[besom.internal.BesomSyntax.pulumiStack]] - the stack name of the current Pulumi stack + * + * Inside `Pulumi.run` block you can use all of the abovemethods without the `Pulumi.` prefix. Should you need to use one of these methods + * outside of the `Pulumi.run` block, you can use the following using clauses: + * - `(using Context)` if you have a `import besom.*` clause on top of the file or + * - `(using besom.Context)` using a fully qualified name of the type. * - * Inside `Pulumi.run` block you can use all methods without `Pulumi.` prefix. All functions that belong to Besom program but are defined - * outside the `Pulumi.run` block should have the following using clause: `(using Context)` or `(using besom.Context)` using a fully - * qualified name of the type. + * There are also two other functions exported by [[besom.Pulumi]]: + * - [[besom.internal.BesomModule.component]] - creates a new component resource + * - [[besom.internal.BesomModule.opts]] - shortcut function allowing for uniform resource options syntax * * The hello world example: + * * {{{ * import besom.* * @@ -42,6 +51,10 @@ trait FutureMonadModule extends BesomModule: * Stack(dependsOn = message) * } * }}} + * + * Notice that Besom is purely functional and therefore evaluation is lazy - you need to reference all the `Output`s you want evaluated. In + * the above example, we reference the `Output[Unit]` returned by the `log.warn` method as one of the dependencies of the `Stack` resource. + * Should we not do this, the logging statement will not be evaluated (it will be a no-op). */ object Pulumi extends FutureMonadModule export Pulumi.{component => _, *, given} @@ -64,10 +77,10 @@ import scala.reflect.Typeable * @return * The component resource. */ -def component[A <: ComponentResource & Product: RegistersOutputs: Typeable](using ctx: Context)( +def component[A <: ComponentResource & Product: RegistersOutputs: Typeable]( name: NonEmptyString, typ: ResourceType, opts: ComponentResourceOptions = ComponentResourceOptions() )( - f: Context ?=> ComponentBase ?=> A + f: ComponentBase ?=> A ): Output[A] = Pulumi.component(name, typ, opts)(f) diff --git a/core/src/main/scala/besom/internal/BesomModule.scala b/core/src/main/scala/besom/internal/BesomModule.scala index c5a53ebf..6192f30b 100644 --- a/core/src/main/scala/besom/internal/BesomModule.scala +++ b/core/src/main/scala/besom/internal/BesomModule.scala @@ -1,6 +1,6 @@ package besom.internal -import besom.internal.logging.{LocalBesomLogger => logger, BesomLogger} +import besom.internal.logging.{BesomMDC, LocalBesomLogger => logger, BesomLogger} import besom.util.printer /** An abstract effect Besom module, which can be implemented for different effect types. @@ -18,11 +18,24 @@ trait EffectBesomModule extends BesomSyntax: protected lazy val rt: Runtime[Eff] - /** Run a [[besom.Pulumi]] program in the Besom [[besom.Context]] and export Stack outputs. + /** Run a [[besom.Pulumi]] program with a Besom [[besom.Context]] and export Stack outputs. * - * Inside `Pulumi.run` block you can use all methods without `Pulumi.` prefix. All functions that belong to Besom program but are defined - * outside the `Pulumi.run` block should have the following using clause: `(using Context)` or `(using besom.Context)` using a fully - * qualified name of the type. + * Inside `Pulumi.run` block you can use the following methods without `Pulumi.` prefix: + * - [[besom.internal.BesomSyntax.isDryRun]] - is the current run a dry run (planning instead of deployment) + * - [[besom.internal.BesomSyntax.config]] - provides access to the configuration and secrets + * - [[besom.internal.BesomSyntax.log]] - all your logging needs + * - [[besom.internal.BesomSyntax.urn]] - the URN of the current Pulumi stack + * - [[besom.internal.BesomSyntax.pulumiOrganization]] - the organization of the current Pulumi stack + * - [[besom.internal.BesomSyntax.pulumiProject]] - the project name of the current Pulumi stack + * - [[besom.internal.BesomSyntax.pulumiStack]] - the stack name of the current Pulumi stack + * + * Should you need to use one of these methods outside of the `Pulumi.run` block, you can use the following using clauses: + * - `(using Context)` if you have a `import besom.*` clause on top of the file or + * - `(using besom.Context)` using a fully qualified name of the type. + * + * There are also two other functions exported by [[besom.Pulumi]]: + * - [[besom.internal.BesomModule.component]] - creates a new component resource + * - [[besom.internal.BesomModule.opts]] - shortcut function allowing for uniform resource options syntax * * Example: * {{{ @@ -40,6 +53,8 @@ trait EffectBesomModule extends BesomSyntax: * the program to run */ def run(program: Context ?=> Stack): Unit = + given emptyMDC: BesomMDC[_] = BesomMDC.empty + val everything: Result[Unit] = Result.scoped { for _ <- BesomLogger.setupLogger() diff --git a/core/src/main/scala/besom/internal/BesomSyntax.scala b/core/src/main/scala/besom/internal/BesomSyntax.scala index 83462510..c22b7ade 100644 --- a/core/src/main/scala/besom/internal/BesomSyntax.scala +++ b/core/src/main/scala/besom/internal/BesomSyntax.scala @@ -49,7 +49,7 @@ trait BesomSyntax: * the current project [[besom.types.URN]] instance */ def urn(using ctx: Context): Output[URN] = - Output.ofData(ctx.getParentURN.map(OutputData(_))) + Output.ofData(ctx.getStackURN.map(OutputData(_))) /** @param ctx * the Besom context @@ -86,66 +86,75 @@ trait BesomSyntax: * @return * the component resource instance */ - def component[A <: ComponentResource & Product: RegistersOutputs: Typeable](using ctx: Context)( + def component[A <: ComponentResource & Product: RegistersOutputs: Typeable]( name: NonEmptyString, typ: ResourceType, opts: ComponentResourceOptions = ComponentResourceOptions() )( - f: Context ?=> ComponentBase ?=> A - ): Output[A] = + f: ComponentBase ?=> A + ): Output[A] = Output.getContext.flatMap { ctx => Output.ofData { ctx - .registerComponentResource(name, typ, opts) + .registerComponentResource(name, typ, opts)(using ctx) .flatMap { componentBase => val urnRes: Result[URN] = componentBase.urn.getValueOrFail { s"Urn for component resource $name is not available. This should not happen." - } + }(using ctx) val componentContext = ComponentContext(ctx, urnRes, componentBase) val componentOutput = - try Output(Result.pure(f(using componentContext)(using componentBase))) - catch case e: Exception => Output(Result.fail(e)) + try Output.pure(f(using componentBase)) + catch case e: Exception => Output.fail(e) val componentResult = componentOutput.getValueOrFail { s"Component resource $name of type $typ did not return a value. This should not happen." - } + }(using componentContext) componentResult.flatMap { a => - val serializedOutputs = RegistersOutputs[A].serializeOutputs(a) - ctx.registerResourceOutputs(name, typ, urnRes, serializedOutputs) *> Result.pure(a) + val serializedOutputs = RegistersOutputs[A].serializeOutputs(a)(using componentContext) + ctx.registerResourceOutputs(name, typ, urnRes, serializedOutputs)(using componentContext) *> Result.pure(a) } } .map(OutputData(_)) } - end component + } extension [A <: ProviderResource](pr: A) - def provider(using Context): Output[Option[ProviderResource]] = Output { - Context().resources.getStateFor(pr).map(_.custom.provider) + def provider: Output[Option[ProviderResource]] = Output.getContext.flatMap { implicit ctx => + Output.ofResult { + ctx.resources.getStateFor(pr).map(_.custom.provider) + } } extension [A <: CustomResource](cr: A) - def provider(using Context): Output[Option[ProviderResource]] = Output { - Context().resources.getStateFor(cr).map(_.provider) + def provider: Output[Option[ProviderResource]] = Output.getContext.flatMap { implicit ctx => + Output.ofResult { + ctx.resources.getStateFor(cr).map(_.provider) + } } extension [A <: ComponentResource](cmpr: A) - def providers(using Context): Output[Map[String, ProviderResource]] = Output { - Context().resources.getStateFor(cmpr).map(_.providers) + def providers: Output[Map[String, ProviderResource]] = Output.getContext.flatMap { implicit ctx => + Output.ofResult { + ctx.resources.getStateFor(cmpr).map(_.providers) + } } extension [A <: RemoteComponentResource](cb: A) - def providers(using Context): Output[Map[String, ProviderResource]] = Output { - Context().resources.getStateFor(cb).map(_.providers) + def providers: Output[Map[String, ProviderResource]] = Output.getContext.flatMap { implicit ctx => + Output.ofResult { + ctx.resources.getStateFor(cb).map(_.providers) + } } extension [A <: Resource: ResourceDecoder](companion: ResourceCompanion[A]) - def get(name: Input[NonEmptyString], id: Input[ResourceId])(using ctx: Context): Output[A] = + def get(name: Input[NonEmptyString], id: Input[ResourceId]): Output[A] = Output.getContext.flatMap { implicit ctx => for name <- name.asOutput() id <- id.asOutput() res <- ctx.readOrRegisterResource[A, EmptyArgs](companion.typeToken, name, EmptyArgs(), CustomResourceOptions(importId = id)) yield res + } extension (s: String) /** Converts a [[String]] to a [[NonEmptyString]] if it is not empty or blank. @@ -159,13 +168,13 @@ trait BesomSyntax: /** Converts a [[String]] to an [[Output]] of [[NonEmptyString]] if it is not empty or blank, otherwise returns a failed [[Output]] with * an [[IllegalArgumentException]]. */ - def toNonEmptyOutput(using Context): Output[NonEmptyString] = - NonEmptyString(s).fold(Output.fail(IllegalArgumentException(s"String $s was empty!")))(Output.apply(_)) + def toNonEmptyOutput: Output[NonEmptyString] = + NonEmptyString(s).fold(Output.fail(IllegalArgumentException(s"String $s was empty!")))(Output.pure(_)) extension (os: Output[String]) /** Converts an [[Output]] of [[String]] to an [[Output]] of [[NonEmptyString]] which will be failed if the string is empty. */ - def toNonEmptyOutput(using Context): Output[NonEmptyString] = + def toNonEmptyOutput: Output[NonEmptyString] = os.flatMap(_.toNonEmptyOutput) /** Shortcut function allowing for uniform resource options syntax everywhere. diff --git a/core/src/main/scala/besom/internal/Codegen.scala b/core/src/main/scala/besom/internal/Codegen.scala index 62b9eabd..cf9d8836 100644 --- a/core/src/main/scala/besom/internal/Codegen.scala +++ b/core/src/main/scala/besom/internal/Codegen.scala @@ -12,7 +12,7 @@ object Codegen: isSecret: Boolean, environment: List[String], default: Option[A] - )(using Context): Output[Option[A]] = besom.Config(providerName).flatMap(_.getOrDefault(key, isSecret, environment, default)) + ): Output[Option[A]] = besom.Config(providerName).flatMap(_.getOrDefault(key, isSecret, environment, default)) /** Used by the codegen module in the generated code. */ diff --git a/core/src/main/scala/besom/internal/Config.scala b/core/src/main/scala/besom/internal/Config.scala index 1c6eb99e..cba29584 100644 --- a/core/src/main/scala/besom/internal/Config.scala +++ b/core/src/main/scala/besom/internal/Config.scala @@ -43,15 +43,15 @@ class Config private ( * @return * the configuration value of the requested type */ - private def getRawValue(key: NonEmptyString)(using ctx: Context): Output[Option[String]] = + private def getRawValue(key: NonEmptyString): Output[Option[String]] = if configSecretKeys.contains(key) then Output.secret(tryGet(key)) - else Output(tryGet(key)) + else Output.pure(tryGet(key)) private def readConfigValue[A: ConfigValueReader]( key: NonEmptyString, rawValue: Output[Option[String]] - )(using Context): Output[Option[A]] = + ): Output[Option[A]] = rawValue.flatMap { valueOpt => Output.ofData { Result @@ -81,8 +81,6 @@ class Config private ( * whether the configuration value is a secret * @param default * the environment variable names to probe for default value - * @param Context - * the Besom context * @tparam A * the type of the configuration value * @return @@ -94,26 +92,24 @@ class Config private ( isSecret: Boolean, environment: List[String], default: Option[A] - )(using Context): Output[Option[A]] = + ): Output[Option[A]] = val rawValue = unsafeGet(key) .orElse(environment.collectFirst { case env if sys.env.contains(env) => sys.env(env) }) - val value = if isSecret then Output.secret(rawValue) else Output(rawValue) + val value = if isSecret then Output.secret(rawValue) else Output.pure(rawValue) readConfigValue(key, value).map(_.orElse(default)) /** Loads an optional configuration or secret value by its key, or returns [[None]] if it doesn't exist. If the configuration value is a * secret, it will be marked internally as such and redacted in console outputs. * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @tparam A * the type of the configuration or secret value * @return * an optional configuration or secret value of the requested type */ - def get[A: ConfigValueReader](key: NonEmptyString)(using Context): Output[Option[A]] = + def get[A: ConfigValueReader](key: NonEmptyString): Output[Option[A]] = readConfigValue(key, getRawValue(key)) /** Loads a configuration or secret value by its key, or throws if it doesn't exist. If the configuration value is a secret, it will be @@ -121,18 +117,16 @@ class Config private ( * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @tparam A * the type of the configuration or secret value * @return * the configuration or secret value of the requested type or [[ConfigError]] */ - def require[A: ConfigValueReader](key: NonEmptyString)(using Context): Output[A] = { + def require[A: ConfigValueReader](key: NonEmptyString): Output[A] = { def secretOption = if configSecretKeys.contains(key) then "[--secret]" else "" get[A](key).flatMap { valueOpt => valueOpt match - case Some(value) => Output(value) + case Some(value) => Output.pure(value) case None => Output.fail { ConfigError( @@ -148,145 +142,121 @@ class Config private ( * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * an optional configuration or secret [[String]] value */ - def getString(key: NonEmptyString)(using Context): Output[Option[String]] = get[String](key) + def getString(key: NonEmptyString): Output[Option[String]] = get[String](key) /** Loads a configuration or secret value by its key, or throws if it doesn't exist. If the configuration value is a secret, it will be * marked internally as such and redacted in console outputs. * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * the configuration or secret [[String]] value or [[ConfigError]] */ - def requireString(key: NonEmptyString)(using Context): Output[String] = require[String](key) + def requireString(key: NonEmptyString): Output[String] = require[String](key) /** Loads an optional configuration or secret value by its key, or returns [[None]] if it doesn't exist. If the configuration value is a * secret, it will be marked internally as such and redacted in console outputs. * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * an optional configuration or secret [[Double]] value */ - def getDouble(key: NonEmptyString)(using Context): Output[Option[Double]] = get[Double](key) + def getDouble(key: NonEmptyString): Output[Option[Double]] = get[Double](key) /** Loads a configuration or secret value by its key, or throws if it doesn't exist. If the configuration value is a secret, it will be * marked internally as such and redacted in console outputs. * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * the configuration or secret [[Double]] value or [[ConfigError]] */ - def requireDouble(key: NonEmptyString)(using Context): Output[Double] = require[Double](key) + def requireDouble(key: NonEmptyString): Output[Double] = require[Double](key) /** Loads an optional configuration or secret value by its key, or returns [[None]] if it doesn't exist. If the configuration value is a * secret, it will be marked internally as such and redacted in console outputs. * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * an optional configuration or secret [[Int]] value */ - def getInt(key: NonEmptyString)(using Context): Output[Option[Int]] = get[Int](key) + def getInt(key: NonEmptyString): Output[Option[Int]] = get[Int](key) /** Loads a configuration or secret value by its key, or throws if it doesn't exist. If the configuration value is a secret, it will be * marked internally as such and redacted in console outputs. * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * the configuration or secret [[Int]] value or [[ConfigError]] */ - def requireInt(key: NonEmptyString)(using Context): Output[Int] = require[Int](key) + def requireInt(key: NonEmptyString): Output[Int] = require[Int](key) /** Loads an optional configuration or secret value by its key, or returns [[None]] if it doesn't exist. If the configuration value is a * secret, it will be marked internally as such and redacted in console outputs. * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * an optional configuration or secret [[Boolean]] value */ - def getBoolean(key: NonEmptyString)(using Context): Output[Option[Boolean]] = get[Boolean](key) + def getBoolean(key: NonEmptyString): Output[Option[Boolean]] = get[Boolean](key) /** Loads a configuration or secret value by its key, or throws if it doesn't exist. If the configuration value is a secret, it will be * marked internally as such and redacted in console outputs. * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * the configuration or secret [[Boolean]] value or [[ConfigError]] */ - def requireBoolean(key: NonEmptyString)(using Context): Output[Boolean] = require[Boolean](key) + def requireBoolean(key: NonEmptyString): Output[Boolean] = require[Boolean](key) /** Loads an optional configuration or secret value by its key, or returns [[None]] if it doesn't exist. If the configuration value is a * secret, it will be marked internally as such and redacted in console outputs. * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * an optional configuration or secret [[besom.json.JsValue]] value */ - def getJson(key: NonEmptyString)(using Context): Output[Option[JsValue]] = get[JsValue](key) + def getJson(key: NonEmptyString): Output[Option[JsValue]] = get[JsValue](key) /** Loads a configuration or secret value by its key, or throws if it doesn't exist. If the configuration value is a secret, it will be * marked internally as such and redacted in console outputs. * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * the configuration or secret [[besom.json.JsValue]] value or [[ConfigError]] */ - def requireJson(key: NonEmptyString)(using Context): Output[JsValue] = require[JsValue](key) + def requireJson(key: NonEmptyString): Output[JsValue] = require[JsValue](key) /** Loads an optional configuration or secret value by its key, or returns [[None]] if it doesn't exist. If the configuration value is a * secret, it will be marked internally as such and redacted in console outputs. * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @tparam A * the type to deserialize configuration or secret JSON value into * @return * an optional configuration or secret deserialized JSON value of the requested type */ - def getObject[A: ConfigValueReader: JsonReader](key: NonEmptyString)(using Context): Output[Option[A]] = get[A](key) + def getObject[A: ConfigValueReader: JsonReader](key: NonEmptyString): Output[Option[A]] = get[A](key) /** Loads a configuration or secret value by its key, or Output.fail it doesn't exist. If the configuration value is a secret, it will be * marked internally as such and redacted in console outputs. * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @tparam A * the type to deserialize configuration or secret JSON value into * @return * the configuration or secret deserialized JSON value of the requested type or [[ConfigError]] */ - def requireObject[A: ConfigValueReader: JsonReader](key: NonEmptyString)(using Context): Output[A] = require[A](key) + def requireObject[A: ConfigValueReader: JsonReader](key: NonEmptyString): Output[A] = require[A](key) end Config //noinspection ScalaUnusedSymbol @@ -363,14 +333,12 @@ object Config: * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @tparam A * the type of the configuration value * @return * an optional configuration or secret value of the requested type */ - def get[A: ConfigValueReader](key: NonEmptyString)(using Context): Output[Option[A]] = + def get[A: ConfigValueReader](key: NonEmptyString): Output[Option[A]] = output.flatMap(_.get[A](key)) /** Loads a configuration or secret value by its key, or Output.fail it doesn't exist. If the configuration value is a secret, it will @@ -380,14 +348,12 @@ object Config: * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @tparam A * the type of the configuration value * @return * the configuration or secret value of the requested type or [[ConfigError]] */ - def require[A: ConfigValueReader](key: NonEmptyString)(using Context): Output[A] = + def require[A: ConfigValueReader](key: NonEmptyString): Output[A] = output.flatMap(_.require[A](key)) /** Loads an optional configuration or secret value by its key, or returns [[None]] if it doesn't exist. If the configuration value is a @@ -395,119 +361,99 @@ object Config: * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * an optional configuration or secret [[String]] value */ - def getString(key: NonEmptyString)(using Context): Output[Option[String]] = output.flatMap(_.getString(key)) + def getString(key: NonEmptyString): Output[Option[String]] = output.flatMap(_.getString(key)) /** Loads a configuration or secret value by its key, or Output.fail it doesn't exist. If the configuration value is a secret, it will * be marked internally as such and redacted in console outputs. * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * the configuration or secret [[String]] value or [[ConfigError]] */ - def requireString(key: NonEmptyString)(using Context): Output[String] = output.flatMap(_.requireString(key)) + def requireString(key: NonEmptyString): Output[String] = output.flatMap(_.requireString(key)) /** Loads an optional configuration or secret value by its key, or returns [[None]] if it doesn't exist. If the configuration value is a * secret, it will be marked internally as such and redacted in console outputs. * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * an optional configuration or secret [[Double]] value */ - def getDouble(key: NonEmptyString)(using Context): Output[Option[Double]] = output.flatMap(_.getDouble(key)) + def getDouble(key: NonEmptyString): Output[Option[Double]] = output.flatMap(_.getDouble(key)) /** Loads a configuration or secret value by its key, or Output.fail it doesn't exist. If the configuration value is a secret, it will * be marked internally as such and redacted in console outputs. * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * the configuration or secret [[Double]] value or [[ConfigError]] */ - def requireDouble(key: NonEmptyString)(using Context): Output[Double] = output.flatMap(_.requireDouble(key)) + def requireDouble(key: NonEmptyString): Output[Double] = output.flatMap(_.requireDouble(key)) /** Loads an optional configuration or secret value by its key, or returns [[None]] if it doesn't exist. If the configuration value is a * secret, it will be marked internally as such and redacted in console outputs. * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * an optional configuration or secret [[Int]] value */ - def getInt(key: NonEmptyString)(using Context): Output[Option[Int]] = output.flatMap(_.getInt(key)) + def getInt(key: NonEmptyString): Output[Option[Int]] = output.flatMap(_.getInt(key)) /** Loads a configuration or secret value by its key, or Output.fail it doesn't exist. If the configuration value is a secret, it will * be marked internally as such and redacted in console outputs. * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * the configuration or secret [[Int]] value or [[ConfigError]] */ - def requireInt(key: NonEmptyString)(using Context): Output[Int] = output.flatMap(_.requireInt(key)) + def requireInt(key: NonEmptyString): Output[Int] = output.flatMap(_.requireInt(key)) /** Loads an optional configuration or secret value by its key, or returns [[None]] if it doesn't exist. If the configuration value is a * secret, it will be marked internally as such and redacted in console outputs. * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * an optional configuration or secret [[Boolean]] value */ - def getBoolean(key: NonEmptyString)(using Context): Output[Option[Boolean]] = output.flatMap(_.getBoolean(key)) + def getBoolean(key: NonEmptyString): Output[Option[Boolean]] = output.flatMap(_.getBoolean(key)) /** Loads a configuration or secret value by its key, or Output.fail it doesn't exist. If the configuration value is a secret, it will * be marked internally as such and redacted in console outputs. * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * the configuration or secret [[Boolean]] value or [[ConfigError]] */ - def requireBoolean(key: NonEmptyString)(using Context): Output[Boolean] = output.flatMap(_.requireBoolean(key)) + def requireBoolean(key: NonEmptyString): Output[Boolean] = output.flatMap(_.requireBoolean(key)) /** Loads an optional configuration or secret value by its key, or returns [[None]] if it doesn't exist. If the configuration value is a * secret, it will be marked internally as such and redacted in console outputs. * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * an optional configuration or secret [[besom.json.JsValue]] value */ - def getJson(key: NonEmptyString)(using Context): Output[Option[JsValue]] = output.flatMap(_.getJson(key)) + def getJson(key: NonEmptyString): Output[Option[JsValue]] = output.flatMap(_.getJson(key)) /** Loads a configuration or secret value by its key, or Output.fail it doesn't exist. If the configuration value is a secret, it will * be marked internally as such and redacted in console outputs. * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @return * the configuration or secret [[besom.json.JsValue]] value or [[ConfigError]] */ - def requireJson(key: NonEmptyString)(using Context): Output[JsValue] = output.flatMap(_.requireJson(key)) + def requireJson(key: NonEmptyString): Output[JsValue] = output.flatMap(_.requireJson(key)) /** Loads an optional configuration or secret value by its key, or returns [[None]] if it doesn't exist. If the configuration value is a * secret, it will be marked internally as such and redacted in console outputs. @@ -515,14 +461,12 @@ object Config: * Requires `JsonReader[A]` or `ConfigValueReader[A]` to be in scope. * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @tparam A * the type to deserialize configuration or secret JSON value into * @return * an optional configuration or secret deserialized JSON value of the requested type */ - def getObject[A: ConfigValueReader: JsonReader](key: NonEmptyString)(using Context): Output[Option[A]] = + def getObject[A: ConfigValueReader: JsonReader](key: NonEmptyString): Output[Option[A]] = output.flatMap(_.getObject[A](key)) /** Loads a configuration or secret value by its key, or Output.fail it doesn't exist. If the configuration value is a secret, it will @@ -532,14 +476,12 @@ object Config: * * @param key * the requested configuration or secret key - * @param Context - * the Besom context * @tparam A * the type to deserialize configuration or secret JSON value into * @return * the configuration or secret deserialized JSON value of the requested type or [[ConfigError]] */ - def requireObject[A: ConfigValueReader: JsonReader](key: NonEmptyString)(using Context): Output[A] = + def requireObject[A: ConfigValueReader: JsonReader](key: NonEmptyString): Output[A] = output.flatMap(_.requireObject[A](key)) end extension end Config @@ -548,11 +490,10 @@ trait ConfigFactory: /** Creates a new Config with the given namespace. * @param namespace * the configuration bag’s logical name that uniquely identifies it. - * @param Context - * the Besom context. * @return * a new Config with the given namespace. */ - def apply(namespace: NonEmptyString)(using Context): Output[Config] = - val projectConfig = Context().config - Output(Config.forNamespace(namespace, projectConfig.configMap, projectConfig.configSecretKeys)) + def apply(namespace: NonEmptyString): Output[Config] = Output.getContext.flatMap { ctx => + val projectConfig = ctx.config + Output.ofResult(Config.forNamespace(namespace, projectConfig.configMap, projectConfig.configSecretKeys)) + } diff --git a/core/src/main/scala/besom/internal/Context.scala b/core/src/main/scala/besom/internal/Context.scala index 96546bf0..5b4716d3 100644 --- a/core/src/main/scala/besom/internal/Context.scala +++ b/core/src/main/scala/besom/internal/Context.scala @@ -8,13 +8,14 @@ import scala.annotation.implicitNotFound case class InvokeOptions(parent: Option[Resource] = None, provider: Option[ProviderResource] = None, version: Option[String] = None) -@implicitNotFound(s"""|Pulumi code has to be written with a Context in scope. +@implicitNotFound(s"""|Some of the Pulumi functions require access to the Context. | - |Context is available by default in your main pulumi function, inside of `Pulumi.run`. - |NOTE: Every pulumi program should only have ONE `Pulumi.run` call. + |Context is available as a given (implicitly) in your main pulumi function, inside of `Pulumi.run` block. + |NOTE: Every pulumi program should have only ONE `Pulumi.run` call. | - |If you are writing code outside of `Pulumi.run`, you can pass a Context explicitly. - |This can be done by just adding a `(using Context)` clause to your function.""".stripMargin) + |If you are writing code outside of `Pulumi.run` and need to call, for example, `isDryRun`, + |you can pass the Context explicitly. This can be done by just adding a `(using Context)` clause + |to your function.""".stripMargin) trait Context extends TaskTracker: private[besom] def initializeStack: Result[Unit] private[besom] def featureSupport: FeatureSupport @@ -22,6 +23,7 @@ trait Context extends TaskTracker: private[besom] def runInfo: RunInfo private[besom] def monitor: Monitor private[besom] def memo: Memo + private[besom] def getStackURN: Result[URN] private[besom] def getParentURN: Result[URN] private[besom] def getParent: Option[Resource] private[besom] def config: Config @@ -129,11 +131,13 @@ class ContextImpl( override private[besom] def pulumiStack: NonEmptyString = runInfo.stack override private[besom] def getParentURN: Result[URN] = - stackPromise.get.flatMap(_.urn.getData).map(_.getValue).flatMap { + stackPromise.get.flatMap(_.urn.getData(using this)).map(_.getValue).flatMap { case Some(urn) => Result.pure(urn) case None => Result.fail(Exception("Stack urn is not available. This should not happen.")) } + override private[besom] def getStackURN: Result[URN] = getParentURN + // top level Context does not return a parent (stack is the top level resource and it's providers are default provider instances) override private[besom] def getParent: Option[Resource] = None diff --git a/core/src/main/scala/besom/internal/Input.scala b/core/src/main/scala/besom/internal/Input.scala index 8314aa9f..a38f6bc7 100644 --- a/core/src/main/scala/besom/internal/Input.scala +++ b/core/src/main/scala/besom/internal/Input.scala @@ -15,63 +15,61 @@ object Input: given simpleInputOps: {} with extension [A](input: Input[A]) - private[Input] def wrappedAsOutput(isSecret: Boolean = false)(using ctx: Context): Output[A] = + private[Input] def wrappedAsOutput(isSecret: Boolean = false): Output[A] = input match case output: Output[_] => output.asInstanceOf[Output[A]] - case a: A @unchecked => if isSecret then Output.secret(a) else Output(a) + case a: A @unchecked => if isSecret then Output.secret(a) else Output.pure(a) extension [A](input: Input[A]) - def asOutput(isSecret: Boolean = false)(using ctx: Context): Output[A] = + def asOutput(isSecret: Boolean = false): Output[A] = input.wrappedAsOutput(isSecret) extension [A](input: Input.Optional[A]) - private[Input] def wrappedAsOptionOutput(isSecret: Boolean = false)(using ctx: Context): Output[Option[A]] = + private[Input] def wrappedAsOptionOutput(isSecret: Boolean = false): Output[Option[A]] = val output = input match case output: Output[_] => output.asInstanceOf[Output[A | Option[A]]] - case maybeA: (A | Option[A]) @unchecked => if isSecret then Output.secret(maybeA) else Output(maybeA) + case maybeA: (A | Option[A]) @unchecked => if isSecret then Output.secret(maybeA) else Output.pure(maybeA) output.map(_.asOption) - def asOptionOutput(isSecret: Boolean = false)(using ctx: Context): Output[Option[A]] = + def asOptionOutput(isSecret: Boolean = false): Output[Option[A]] = input.wrappedAsOptionOutput(isSecret) given mapInputOps: {} with - private def inputMapToMapOutput[A](inputMap: Map[String, Input[A]], isSecret: Boolean)(using ctx: Context): Output[Map[String, A]] = + private def inputMapToMapOutput[A](inputMap: Map[String, Input[A]], isSecret: Boolean): Output[Map[String, A]] = val outputMap = inputMap.view.mapValues(_.asOutput(isSecret)).toMap Output.traverseMap(outputMap) extension [A](input: Input[Map[String, Input[A]]]) - def asOutput(isSecret: Boolean = false)(using ctx: Context): Output[Map[String, A]] = + def asOutput(isSecret: Boolean = false): Output[Map[String, A]] = input.wrappedAsOutput(isSecret).flatMap(inputMapToMapOutput(_, isSecret = isSecret)) extension [A](input: Input.Optional[Map[String, Input[A]]]) - def asOptionOutput(isSecret: Boolean = false)(using ctx: Context): Output[Option[Map[String, A]]] = + def asOptionOutput(isSecret: Boolean = false): Output[Option[Map[String, A]]] = input.wrappedAsOptionOutput(isSecret).flatMap { case Some(map) => inputMapToMapOutput(map, isSecret = isSecret).map(Option(_)) - case None => Output(None) + case None => Output.pure(None) } given iterableInputOps: {} with - private def inputIterableToIterableOutput[A](inputIterable: Iterable[Input[A]], isSecret: Boolean)(using - ctx: Context - ): Output[Iterable[A]] = + private def inputIterableToIterableOutput[A](inputIterable: Iterable[Input[A]], isSecret: Boolean): Output[Iterable[A]] = val outputIterable = inputIterable.map(simpleInputOps.asOutput(_)(isSecret = isSecret)) Output.sequence(outputIterable) extension [A](input: Input.OneOrIterable[A]) - def asManyOutput(isSecret: Boolean = false)(using ctx: Context): Output[Iterable[A]] = + def asManyOutput(isSecret: Boolean = false): Output[Iterable[A]] = input.wrappedAsOutput(isSecret).flatMap { case iterable: Iterable[Input[A]] @unchecked => inputIterableToIterableOutput(iterable, isSecret = isSecret) - case a: A @unchecked => Output(Iterable(a)) + case a: A @unchecked => Output.pure(Iterable(a)) } extension [A](input: Input[Iterable[Input[A]]]) - def asOutput(isSecret: Boolean = false)(using ctx: Context): Output[Iterable[A]] = + def asOutput(isSecret: Boolean = false): Output[Iterable[A]] = input.wrappedAsOutput(isSecret).flatMap(inputIterableToIterableOutput(_, isSecret = isSecret)) extension [A](input: Input.Optional[Iterable[Input[A]]]) - def asOptionOutput(isSecret: Boolean = false)(using ctx: Context): Output[Option[Iterable[A]]] = + def asOptionOutput(isSecret: Boolean = false): Output[Option[Iterable[A]]] = input.wrappedAsOptionOutput(isSecret).flatMap { case Some(map) => inputIterableToIterableOutput(map, isSecret = isSecret).map(Option(_)) - case None => Output(None) + case None => Output.pure(None) } end Input diff --git a/core/src/main/scala/besom/internal/Output.scala b/core/src/main/scala/besom/internal/Output.scala index 7f3ec976..a4db108b 100644 --- a/core/src/main/scala/besom/internal/Output.scala +++ b/core/src/main/scala/besom/internal/Output.scala @@ -3,24 +3,18 @@ package besom.internal import scala.collection.BuildFrom /** Output is a wrapper for a monadic effect used to model async execution that allows Pulumi to track information about dependencies - * between resources and properties of data (whether it's known or a secret for instance). - * - * Invariant: `dataResult` has to be registered in [[TaskTracker]] by the time it reaches the constructor here. - * @param dataResult - * Effect of type [[Result]][A] - * @param ctx - * the Besom [[Context]] + * between resources and properties of data (whether it's known or a secret for instance). Outputs are lazy, meaning that they are not + * evaluated until their value is needed. */ -class Output[+A] private[internal] (using private[besom] val ctx: Context)( - private val dataResult: Result[OutputData[A]] -): +class Output[+A](private val inner: Context => Result[OutputData[A]]): + /** Maps the value of the Output using the given function. * @param f * the function to apply to the value * @return * an Output with the mapped value */ - def map[B](f: A => B): Output[B] = Output.ofData(dataResult.map(_.map(f))) + def map[B](f: A => B): Output[B] = new Output[B](ctx => inner(ctx).map(_.map(f))) /** Flat-maps the value of the Output using the given function. * @tparam B @@ -32,13 +26,12 @@ class Output[+A] private[internal] (using private[besom] val ctx: Context)( * @see * `flatMap(A => F[B])` for flat-mapping with an effectful function */ - def flatMap[B](f: A => Output[B]): Output[B] = - Output.ofData( - for - outputData: OutputData[A] <- dataResult - nested: OutputData[OutputData[B]] <- outputData.traverseResult(a => f(a).getData) - yield nested.flatten - ) + def flatMap[B](f: A => Output[B]): Output[B] = new Output(ctx => + for + outputData: OutputData[A] <- inner(ctx) + nested: OutputData[OutputData[B]] <- outputData.traverseResult(a => f(a).inner(ctx)) + yield nested.flatten + ) /** Flat-maps the value of the Output using the given effectful function. * @tparam F @@ -52,13 +45,12 @@ class Output[+A] private[internal] (using private[besom] val ctx: Context)( * @see * `flatMap(A => Output[B])` for flat-mapping with Output-returning function */ - def flatMap[F[_]: Result.ToFuture, B](f: A => F[B]): Output[B] = - Output.ofData( - for - outputData: OutputData[A] <- dataResult - nested: OutputData[OutputData[B]] <- outputData.traverseResult(a => Result.eval(f(a)).map(OutputData(_))) - yield nested.flatten - ) + def flatMap[F[_]: Result.ToFuture, B](f: A => F[B]): Output[B] = new Output(ctx => + for + outputData: OutputData[A] <- inner(ctx) + nested: OutputData[OutputData[B]] <- outputData.traverseResult(a => Result.eval(f(a)).map(OutputData(_))) + yield nested.flatten + ) /** Mock variant of flatMap that will fail at compile time if used with a function that returns a value instead of an Output. * @@ -70,30 +62,37 @@ class Output[+A] private[internal] (using private[besom] val ctx: Context)( If you want to map over the value of an Output, use the map method instead.""" ) + /** Creates an un-nested [[Output]] from an [[Output]] of an [[Output]]. + * @tparam B + * the type of the inner [[Output]] + * @param ev + * evidence that the type of the inner [[Output]] is the same as the type of the outer [[Output]] + * @return + * an [[Output]] with the value of the inner [[Output]] + */ + def flatten[B](using ev: A <:< Output[B]): Output[B] = flatMap(a => ev(a)) + /** Recovers from a failed Output by applying the given function to the [[Throwable]]. * @param f * the function to apply to the [[Throwable]] * @return * an Output with the recovered value */ - def recover[B >: A](f: Throwable => B): Output[B] = - Output.ofData(dataResult.recover { t => Result.pure(OutputData(f(t))) }) + def recover[B >: A](f: Throwable => B): Output[B] = new Output[B](ctx => inner(ctx).recover { t => Result.pure(OutputData(f(t))) }) - /** Recovers from a failed Output by applying the given effectful function to the [[Throwable]]. Can be used to recover with another - * property of the same type. - * @tparam F - * the effect type + /** Recovers from a failed Output by applying the given effectful function to the [[Throwable]]. Function has to return a new Output. + * @tparam B + * the type of the recovered value * @param f - * the effectful function to apply to the [[Throwable]] + * the effectful function returning an Output of B to apply to the [[Throwable]] * @return * an Output with the recovered value */ - def recoverWith[B >: A](f: Throwable => Output[B]): Output[B] = - Output.ofData( - dataResult.recover { t => - f(t).getData - } - ) + def recoverWith[B >: A](f: Throwable => Output[B]): Output[B] = new Output(ctx => + inner(ctx).recover { t => + f(t).inner(ctx) + } + ) /** Recovers from a failed Output by applying the given effectful function to the [[Throwable]]. Can be used to recover with an effect of * a different type. @@ -106,12 +105,11 @@ If you want to map over the value of an Output, use the map method instead.""" * @return * an Output with the recovered value */ - def recoverWith[B >: A, F[_]: Result.ToFuture](f: Throwable => F[B]): Output[B] = - Output.ofData( - dataResult.recover { t => - Result.eval(f(t)).map(OutputData(_)) - } - ) + def recoverWith[B >: A, F[_]: Result.ToFuture](f: Throwable => F[B]): Output[B] = new Output(ctx => + inner(ctx).recover { t => + Result.eval(f(t)).map(OutputData(_)) + } + ) /** Applies the given function to the value of the Output and discards the result. Useful for logging or other side effects. * @param f @@ -130,13 +128,12 @@ If you want to map over the value of an Output, use the map method instead.""" * @return * an Output with the original value */ - def tapError(f: Throwable => Output[Unit]): Output[A] = - Output.ofData( - dataResult.tapBoth { - case Left(t) => f(t).getData.void - case _ => Result.unit - } - ) + def tapError(f: Throwable => Output[Unit]): Output[A] = new Output(ctx => + inner(ctx).tapBoth { + case Left(t) => f(t).inner(ctx).void + case _ => Result.unit + } + ) /** Applies the given functions to the value and error of the Output and discards the results. Useful for logging or other side effects. * Only one of the functions will be called, depending on whether the Output is a success or a failure. @@ -147,16 +144,16 @@ If you want to map over the value of an Output, use the map method instead.""" * @return * an Output with the original value */ - def tapBoth(f: A => Output[Unit], onError: Throwable => Output[Unit]): Output[A] = - Output.ofData( - dataResult.tapBoth { - case Left(t) => onError(t).getData.void - case Right(OutputData.Known(_, _, Some(a))) => f(a).getData.void - case Right(_) => Result.unit - } - ) + def tapBoth(f: A => Output[Unit], onError: Throwable => Output[Unit]): Output[A] = new Output(ctx => + inner(ctx).tapBoth { + case Left(t) => onError(t).inner(ctx).void + case Right(OutputData.Known(_, _, Some(a))) => f(a).inner(ctx).void + case Right(_) => Result.unit + } + ) - /** Combines [[Output]] with the given [[Output]] using the given [[Zippable]], the default implementation results in a [[Tuple]]. + /** Combines [[Output]] with the given [[Output]] returning a new [[Output]] with a tuple of the two values. Subsequent zips flatten the + * resulting tuple: `Output[(A, B)].zip(Output[C]).zip(Output[D])` will result in `Output[(A, B, C, D)]`. * * @tparam B * the type of the other [[Output]] @@ -167,18 +164,9 @@ If you want to map over the value of an Output, use the map method instead.""" * @return * an [[Output]] with the zipped value, by default a [[Tuple]] */ - def zip[B](that: => Output[B])(using z: Zippable[A, B]): Output[z.Out] = - Output.ofData(dataResult.zip(that.getData).map((a, b) => a.zip(b))) - - /** Creates an un-nested [[Output]] from an [[Output]] of an [[Output]]. - * @tparam B - * the type of the inner [[Output]] - * @param ev - * evidence that the type of the inner [[Output]] is the same as the type of the outer [[Output]] - * @return - * an [[Output]] with the value of the inner [[Output]] - */ - def flatten[B](using ev: A <:< Output[B]): Output[B] = flatMap(a => ev(a)) + def zip[B](that: => Output[B])(using z: Zippable[A, B]): Output[z.Out] = new Output(ctx => + inner(ctx).zip(that.inner(ctx)).map((a, b) => a.zip(b)) + ) /** Turns a secret into a plaintext! Only use if you know what you're doing. * @@ -189,20 +177,16 @@ If you want to map over the value of an Output, use the map method instead.""" */ def asPlaintext: Output[A] = withIsSecret(Result.pure(false)) - /** Turns a plaintext into a secret. - * - * This is useful when you have a value that is sensitive in nature, such as a password or cryptographic key, that you don't want to be - * exposed. + /** Turns a plaintext Output into a secret. * * @return - * a secret [[Output]], the value is now a secret + * a secret [[Output]] */ def asSecret: Output[A] = withIsSecret(Result.pure(true)) - /** Discards the value of the Output and replaces it with Unit. Useful for ignoring the value of an Output but preserving the metadata - * about dependencies, secrecy. + /** Discards the value of the Output. * @return - * an Output with the value of Unit + * an [[Output]] with the unit value */ def void: Output[Unit] = map(_ => ()) @@ -215,33 +199,35 @@ If you want to map over the value of an Output, use the map method instead.""" case None => None case c => Some(c.asInstanceOf[C]) } - case None => Output(None) + case None => Output.pure(None) } - private[internal] def getData: Result[OutputData[A]] = dataResult + private[internal] def getData(using ctx: Context): Result[OutputData[A]] = + Context().registerTask(inner(ctx)) - private[internal] def getValue: Result[Option[A]] = dataResult.map(_.getValue) + private[internal] def getValue(using ctx: Context): Result[Option[A]] = + Context().registerTask(inner(ctx)).map(_.getValue) - private[internal] def getValueOrElse[B >: A](default: => B): Result[B] = - dataResult.map(_.getValueOrElse(default)) + private[internal] def getValueOrElse[B >: A](default: => B)(using ctx: Context): Result[B] = + Context().registerTask(inner(ctx)).map(_.getValueOrElse(default)) - private[internal] def getValueOrFail(msg: String): Result[A] = - dataResult.flatMap { + private[internal] def getValueOrFail(msg: String)(using ctx: Context): Result[A] = + Context().registerTask(inner(ctx)).flatMap { case OutputData.Known(_, _, Some(value)) => Result.pure(value) case _ => Result.fail(Exception(msg)) } - private[internal] def withIsSecret(isSecretEff: Result[Boolean]): Output[A] = - Output.ofData( - for - secret <- isSecretEff - o <- dataResult - yield o.withIsSecret(secret) - ) + private[internal] def withContext(ctx: Context): Output[A] = Output.ofData(inner(ctx)) + + private[internal] def withIsSecret(isSecretEff: Result[Boolean]): Output[A] = new Output(ctx => + for + secret <- isSecretEff + o <- inner(ctx) + yield o.withIsSecret(secret) + ) + end Output -/** These factory methods should be the only way to create [[Output]] instances in user code. - */ trait OutputFactory: /** Creates an `Output` that evaluates given effectful computation. * @@ -259,18 +245,18 @@ trait OutputFactory: * @param value * the value to wrap in an `Output` */ - def eval[F[_]: Result.ToFuture, A](value: F[A])(using Context): Output[A] = Output.eval(value) + def eval[F[_]: Result.ToFuture, A](value: F[A]): Output[A] = Output.eval(value) /** Creates an `Output` with the given `value` * * @see * [[secret]] for creating an `Output` with a secret value */ - def apply[A](value: A)(using Context): Output[A] = Output(value) + def apply[A](value: A): Output[A] = Output.pure(value) /** Creates an `Output` that is known to be a secret */ - def secret[A](value: A)(using Context): Output[A] = Output.secret(value) + def secret[A](value: A): Output[A] = Output.secret(value) /** Creates an `Output` of a collection from a collection of Outputs. * @@ -279,7 +265,7 @@ trait OutputFactory: */ def sequence[A, CC[X] <: Iterable[X], To]( coll: CC[Output[A]] - )(using BuildFrom[CC[Output[A]], A, To], Context): Output[To] = Output.sequence(coll) + )(using BuildFrom[CC[Output[A]], A, To]): Output[To] = Output.sequence(coll) /** Creates an `Output` of a collection from a collection of values mapped with the function `f` * @@ -292,25 +278,88 @@ trait OutputFactory: coll: CC[A] )( f: A => Output[B] - )(using BuildFrom[CC[Output[B]], B, To], Context): Output[To] = sequence(coll.map(f).asInstanceOf[CC[Output[B]]]) + )(using BuildFrom[CC[Output[B]], B, To]): Output[To] = sequence(coll.map(f).asInstanceOf[CC[Output[B]]]) /** Creates a failed [[Output]] containing given [[Throwable]] */ - def fail(t: Throwable)(using Context): Output[Nothing] = Output.fail(t) + def fail(t: Throwable): Output[Nothing] = Output.fail(t) /** Creates an `Output` with the given `a` if the given `condition` is `true` or returns `None` if the condition is `false` */ - def when[A](condition: => Input[Boolean])(a: => Input.Optional[A])(using ctx: Context): Output[Option[A]] = + def when[A](condition: => Input[Boolean])(a: => Input.Optional[A]): Output[Option[A]] = Output.when(condition)(a) /** Creates an `Output` that contains Unit */ - def unit(using Context): Output[Unit] = Output(()) + def unit: Output[Unit] = Output.pure(()) end OutputFactory -/** These factory methods provide additional methods on [[Output]] instances for convenience. - */ +object Output: + def getContext: Output[Context] = new Output(ctx => Result.pure(OutputData(ctx))) + + // should be NonEmptyString + def traverseMap[A](map: Map[String, Output[A]]): Output[Map[String, A]] = + sequence(map.map((key, value) => value.map(result => (key, result))).toVector).map(_.toMap) + + def sequence[A, CC[X] <: IterableOnce[X], To]( + coll: CC[Output[A]] + )(using bf: BuildFrom[CC[Output[A]], A, To]): Output[To] = + Output.ofResult { + Result.defer { + coll.iterator + .foldLeft(Output.pure(bf.newBuilder(coll))) { (acc, curr) => + acc.zip(curr).map { case (b, r) => + b += r + } + } + .map(_.result()) + } + }.flatten + + def parSequence[A, CC[X] <: IterableOnce[X], To]( + coll: CC[Output[A]] + )(using bf: BuildFrom[CC[Output[A]], A, To]): Output[To] = + new Output(ctx => { + Result + .defer { + Result.parSequence(coll.iterator.map(_.inner(ctx)).toVector) + } + .flatten + .map { vecOfOutputData => + OutputData.sequence(vecOfOutputData).map(v => bf.fromSpecific(coll)(v)) + } + }) + + def empty(isSecret: Boolean = false): Output[Nothing] = + new Output(ctx => Result.pure(OutputData.empty[Nothing](isSecret = isSecret))) + + def eval[F[_]: Result.ToFuture, A](value: F[A]): Output[A] = + new Output[A](ctx => Result.eval[F, A](value).map(OutputData(_))) + + def fail(t: Throwable): Output[Nothing] = new Output(ctx => Result.fail(t)) + + def ofResult[A](value: => Result[A]): Output[A] = new Output(ctx => value.map(OutputData(_))) + + def defer[A](value: => A): Output[A] = new Output(ctx => Result.defer(OutputData(value))) + + def pure[A](value: A): Output[A] = new Output(ctx => Result.pure(OutputData(value))) + + def ofData[A](value: => Result[OutputData[A]]): Output[A] = new Output(ctx => value) + + def ofData[A](data: OutputData[A]): Output[A] = new Output(ctx => Result.pure(data)) + + def secret[A](value: A): Output[A] = new Output(ctx => Result.pure(OutputData(value, Set.empty, isSecret = true))) + + def when[A](cond: => Input[Boolean])( + a: => Input.Optional[A] + ): Output[Option[A]] = + cond.asOutput().flatMap { c => + if c then a.asOptionOutput(isSecret = false) else Output.pure(None) + } + end when +end Output + trait OutputExtensionsFactory: implicit object OutputSequenceOps: extension [A, CC[X] <: Iterable[X]](coll: CC[Output[A]]) @@ -319,14 +368,14 @@ trait OutputExtensionsFactory: * @see * [[parSequence]] for parallel execution */ - def sequence[To](using BuildFrom[CC[Output[A]], A, To], Context): Output[To] = + def sequence[To](using BuildFrom[CC[Output[A]], A, To]): Output[To] = Output.sequence(coll) /** Creates an `Output` of a collection from a collection of Outputs in parallel. * @see * [[sequence]] for sequential execution */ - def parSequence[To](using BuildFrom[CC[Output[A]], A, To], Context): Output[To] = + def parSequence[To](using BuildFrom[CC[Output[A]], A, To]): Output[To] = Output.parSequence(coll) implicit object OutputTraverseOps: @@ -338,7 +387,7 @@ trait OutputExtensionsFactory: * @see * [[parTraverse]] for parallel execution */ - def traverse[B, To](f: A => Output[B])(using BuildFrom[CC[Output[B]], B, To], Context): Output[To] = + def traverse[B, To](f: A => Output[B])(using BuildFrom[CC[Output[B]], B, To]): Output[To] = Output.sequence(coll.map(f).asInstanceOf[CC[Output[B]]]) /** Applies an Output-returning function to each element in the collection, in parallel, and then combines the results into an Output. @@ -348,7 +397,7 @@ trait OutputExtensionsFactory: * @see * [[traverse]] for sequential execution */ - def parTraverse[B, To](f: A => Output[B])(using BuildFrom[CC[Output[B]], B, To], Context): Output[To] = + def parTraverse[B, To](f: A => Output[B])(using BuildFrom[CC[Output[B]], B, To]): Output[To] = coll.map(f).asInstanceOf[CC[Output[B]]].parSequence implicit final class OutputOptionOps[A](output: Output[Option[A]]): @@ -358,14 +407,14 @@ trait OutputExtensionsFactory: * @return * an [[Output]] with the value of the underlying [[Some]] or the `default` value if [[None]] */ - def getOrElse[B >: A](default: => B | Output[B])(using ctx: Context): Output[B] = + def getOrElse[B >: A](default: => B | Output[B]): Output[B] = output.flatMap { opt => opt match - case Some(a) => Output(a) + case Some(a) => Output.pure(a) case None => default match case b: Output[B @unchecked] => b - case b: B @unchecked => Output(b) + case b: B @unchecked => Output.pure(b) } /** Get the value of the underlying [[Option]] or fail the outer [[Output]] with the given [[Throwable]] @@ -377,9 +426,9 @@ trait OutputExtensionsFactory: * @see * [[OutputFactory.fail]] for creating a failed [[Output]] with a [[Throwable]] */ - def getOrFail(throwable: => Throwable)(using ctx: Context): Output[A] = + def getOrFail(throwable: => Throwable): Output[A] = output.flatMap { - case Some(a) => Output(a) + case Some(a) => Output.pure(a) case None => Output.fail(throwable) } @@ -389,39 +438,39 @@ trait OutputExtensionsFactory: * @return * an [[Output]] with the underlying [[Some]] or the `alternative` value if [[None]] */ - def orElse[B >: A](alternative: => Option[B] | Output[Option[B]])(using ctx: Context): Output[Option[B]] = + def orElse[B >: A](alternative: => Option[B] | Output[Option[B]]): Output[Option[B]] = output.flatMap { - case some @ Some(_) => Output(some) + case some @ Some(_) => Output.pure(some) case None => alternative match case b: Output[Option[B]] => b - case b: Option[B] => Output(b) + case b: Option[B] => Output.pure(b) } /** Calls [[Option.map]] on the underlying [[Option]] with the given function * @return * an [[Output]] of the mapped [[Option]] */ - def mapInner[B](f: A => B | Output[B])(using ctx: Context): Output[Option[B]] = + def mapInner[B](f: A => B | Output[B]): Output[Option[B]] = output.flatMap { case Some(a) => f(a) match case b: Output[B @unchecked] => b.map(Some(_)) - case b: B @unchecked => Output(Some(b)) - case None => Output(None) + case b: B @unchecked => Output.pure(Some(b)) + case None => Output.pure(None) } /** Calls [[Option.flatMap]] on the underlying [[Option]] with the given function * @return * an [[Output]] of the flat-mapped [[Option]] */ - def flatMapInner[B](f: A => Option[B] | Output[Option[B]])(using ctx: Context): Output[Option[B]] = + def flatMapInner[B](f: A => Option[B] | Output[Option[B]]): Output[Option[B]] = output.flatMap { case Some(a) => f(a) match case b: Output[Option[B]] => b - case b: Option[B] => Output(b) - case None => Output(None) + case b: Option[B] => Output.pure(b) + case None => Output.pure(None) } end OutputOptionOps @@ -460,22 +509,22 @@ trait OutputExtensionsFactory: * @return * an [[Output]] of the mapped [[List]] */ - def mapInner[B](f: A => B | Output[B])(using Context): Output[List[B]] = output.flatMap { - case Nil => Output(List.empty[B]) + def mapInner[B](f: A => B | Output[B]): Output[List[B]] = output.flatMap { + case Nil => Output.pure(List.empty[B]) case h :: t => f(h) match case b: Output[B @unchecked] => Output.sequence(b :: t.map(f.asInstanceOf[A => Output[B]](_))) case b: B @unchecked => - Output(b :: t.map(f.asInstanceOf[A => B](_))) + Output.pure(b :: t.map(f.asInstanceOf[A => B](_))) } /** Calls [[List.flatMap]] on the underlying [[List]] with the given function * @return * an [[Output]] of the flat-mapped [[List]] */ - def flatMapInner[B](f: A => List[B] | Output[List[B]])(using Context): Output[List[B]] = output.flatMap { - case Nil => Output(List.empty[B]) + def flatMapInner[B](f: A => List[B] | Output[List[B]]): Output[List[B]] = output.flatMap { + case Nil => Output.pure(List.empty[B]) case h :: t => f(h) match case bs: Output[List[B]] => @@ -485,7 +534,7 @@ trait OutputExtensionsFactory: tailOutput.map(bb ::: _) } case bs: List[B] => - Output(bs ::: t.flatMap(f.asInstanceOf[A => List[B]](_))) + Output.pure(bs ::: t.flatMap(f.asInstanceOf[A => List[B]](_))) } end OutputListOps @@ -527,7 +576,7 @@ trait OutputExtensionsFactory: * @return * an [[Output]] of the mapped [[List]] or an empty list if the optional [[List]] is [[None]] */ - def mapInner[B](f: A => B | Output[B])(using Context): Output[List[B]] = output + def mapInner[B](f: A => B | Output[B]): Output[List[B]] = output .map { case Some(list) => list case None => List.empty @@ -541,7 +590,7 @@ trait OutputExtensionsFactory: * @return * an [[Output]] of the flat-mapped [[List]] or an empty list if the optional [[List]] is [[None]] */ - def flatMapInner[B](f: A => List[B] | Output[List[B]])(using Context): Output[List[B]] = output + def flatMapInner[B](f: A => List[B] | Output[List[B]]): Output[List[B]] = output .map { case Some(list) => list case None => List.empty @@ -551,6 +600,7 @@ trait OutputExtensionsFactory: end OutputOptionListOps implicit class OutputOfTupleOps[A <: NonEmptyTuple](private val output: Output[A]): + /** Unzips the [[Output]] of a non-empty tuple into a tuple of [[Output]]s of the same arity. This operation is equivalent to: * * {{{o: Output[(A, B, C)] => (o.map(_._1), o.map(_._2), o.map(_._3))}}} @@ -569,80 +619,3 @@ trait OutputExtensionsFactory: end OutputOfTupleOps end OutputExtensionsFactory - -object Output: - // should be NonEmptyString - def traverseMap[A](using ctx: Context)(map: Map[String, Output[A]]): Output[Map[String, A]] = - sequence(map.map((key, value) => value.map(result => (key, result))).toVector).map(_.toMap) - - def sequence[A, CC[X] <: IterableOnce[X], To]( - coll: CC[Output[A]] - )(using bf: BuildFrom[CC[Output[A]], A, To], ctx: Context): Output[To] = - Output { - Result.defer { - coll.iterator - .foldLeft(Output(bf.newBuilder(coll))) { (acc, curr) => - acc.zip(curr).map { case (b, r) => - b += r - } - } - .map(_.result()) - } - }.flatten - - def parSequence[A, CC[X] <: IterableOnce[X], To]( - coll: CC[Output[A]] - )(using bf: BuildFrom[CC[Output[A]], A, To], ctx: Context): Output[To] = - Output { - Result - .defer { - Result.parSequence(coll.iterator.map(_.dataResult).toVector) - } - .flatten - .map { vecOfOutputData => - vecOfOutputData.map(Output.ofData(_)) - } - }.flatMap { vecOfOutput => - Output.sequence(vecOfOutput).map { vecOfA => - bf.fromSpecific(coll)(vecOfA) - } - } - - def empty(isSecret: Boolean = false)(using ctx: Context): Output[Nothing] = - new Output(ctx.registerTask(Result.pure(OutputData.empty[Nothing](isSecret = isSecret)))) - - def eval[F[_]: Result.ToFuture, A](value: F[A])(using - ctx: Context - ): Output[A] = - new Output[A](ctx.registerTask(Result.eval(value)).map(OutputData(_))) - - def fail(t: Throwable)(using ctx: Context): Output[Nothing] = - new Output[Nothing](ctx.registerTask(Result.fail(t))) - - def apply[A](value: => Result[A])(using - ctx: Context - ): Output[A] = - new Output[A](ctx.registerTask(OutputData.traverseResult(value))) - - // TODO could this be pure without implicit Context? it's not async in any way so? only test when all tests are written - def apply[A](value: A)(using ctx: Context): Output[A] = - new Output[A](ctx.registerTask(Result.pure(OutputData(value)))) - - def ofData[A](value: => Result[OutputData[A]])(using ctx: Context): Output[A] = - new Output[A](ctx.registerTask(value)) - - // TODO could this be pure without implicit Context? it's not async in any way so? only test when all tests are written - def ofData[A](data: OutputData[A])(using ctx: Context): Output[A] = - new Output[A](ctx.registerTask(Result.pure(data))) - - def secret[A](value: A)(using ctx: Context): Output[A] = - new Output[A](ctx.registerTask(Result.pure(OutputData(value, Set.empty, isSecret = true)))) - - def when[A](cond: => Input[Boolean])( - a: => Input.Optional[A] - )(using ctx: Context): Output[Option[A]] = - cond.asOutput().flatMap { c => - if c then a.asOptionOutput(isSecret = false) else Output(None) - } - end when -end Output diff --git a/core/src/main/scala/besom/internal/OutputData.scala b/core/src/main/scala/besom/internal/OutputData.scala index 2cec222e..cc94ae3f 100644 --- a/core/src/main/scala/besom/internal/OutputData.scala +++ b/core/src/main/scala/besom/internal/OutputData.scala @@ -130,7 +130,7 @@ object OutputData: def empty[A](resources: Set[Resource] = Set.empty, isSecret: Boolean = false): OutputData[A] = Known(resources, isSecret, None) - def traverseResult[A](using Context)(value: => Result[A]): Result[OutputData[A]] = + def traverseResult[A](value: => Result[A]): Result[OutputData[A]] = value.map(OutputData.apply(_)) def sequence[A, CC[X] <: IterableOnce[X], To]( diff --git a/core/src/main/scala/besom/internal/PropertiesSerializer.scala b/core/src/main/scala/besom/internal/PropertiesSerializer.scala index 78469e62..381932d6 100644 --- a/core/src/main/scala/besom/internal/PropertiesSerializer.scala +++ b/core/src/main/scala/besom/internal/PropertiesSerializer.scala @@ -35,5 +35,5 @@ object PropertiesSerializer: private[internal] def detectUnknowns(metadata: Map[String, Metadata]): Boolean = metadata.values.exists(_.unknown) private[internal] def fieldsToResources(metadata: Map[String, Metadata])(using Context): Map[String, Set[Resource]] = metadata.map { case (k, m) => - (k, m.dependencies.map(urn => DependencyResource(Output(urn)).asInstanceOf[Resource]).toSet) + (k, m.dependencies.map(urn => DependencyResource(Output.pure(urn)).asInstanceOf[Resource]).toSet) } diff --git a/core/src/main/scala/besom/internal/ProtobufUtil.scala b/core/src/main/scala/besom/internal/ProtobufUtil.scala index 631383c2..6e37be09 100644 --- a/core/src/main/scala/besom/internal/ProtobufUtil.scala +++ b/core/src/main/scala/besom/internal/ProtobufUtil.scala @@ -22,7 +22,7 @@ object ProtobufUtil: extension (i: Int) def asValue: Value = Value(Kind.NumberValue(i)) given ToValue[Long] with - extension (l: Long) def asValue: Value = Value(Kind.NumberValue(l)) + extension (l: Long) def asValue: Value = Value(Kind.NumberValue(l.toDouble)) given ToValue[String] with extension (s: String) def asValue: Value = Value(Kind.StringValue(s)) diff --git a/core/src/main/scala/besom/internal/RawResourceResult.scala b/core/src/main/scala/besom/internal/RawResourceResult.scala index 74da2a73..f6d91eb6 100644 --- a/core/src/main/scala/besom/internal/RawResourceResult.scala +++ b/core/src/main/scala/besom/internal/RawResourceResult.scala @@ -1,13 +1,13 @@ package besom.internal import com.google.protobuf.struct.* -import besom.types.* +import besom.types.{URN, ResourceId, FunctionToken} import besom.util.printer case class RawResourceResult(urn: URN, id: Option[ResourceId], data: Struct, dependencies: Map[String, Set[Resource]]) object RawResourceResult: - def fromResponse(response: pulumirpc.resource.ReadResourceResponse, id: ResourceId)(using Context): Result[RawResourceResult] = + def fromResponse(response: pulumirpc.resource.ReadResourceResponse, id: ResourceId): Result[RawResourceResult] = Result.evalTry(URN.from(response.urn)).map { urn => RawResourceResult( urn = urn, @@ -19,7 +19,7 @@ object RawResourceResult: ) } - def fromResponse(response: pulumirpc.resource.RegisterResourceResponse)(using Context): Result[RawResourceResult] = + def fromResponse(response: pulumirpc.resource.RegisterResourceResponse): Result[RawResourceResult] = val dependenciesPerField = Result.sequenceMap { response.propertyDependencies @@ -31,7 +31,7 @@ object RawResourceResult: val depsForProperty: Result[Set[Resource]] = urnsResult.map { setOfUrns => setOfUrns - .map(Output(_)) + .map(Output.pure(_)) .map(DependencyResource(_)) // we do not register DependencyResources! } @@ -53,7 +53,7 @@ object RawResourceResult: dependencies = deps ) - def fromValue(tok: FunctionToken, value: Value)(using Context): Result[RawResourceResult] = + def fromValue(tok: FunctionToken, value: Value): Result[RawResourceResult] = value match case Value(Value.Kind.StructValue(struct), _) => lazy val missingUrnErr = diff --git a/core/src/main/scala/besom/internal/Resource.scala b/core/src/main/scala/besom/internal/Resource.scala index a35a9ecd..dabe10b0 100644 --- a/core/src/main/scala/besom/internal/Resource.scala +++ b/core/src/main/scala/besom/internal/Resource.scala @@ -1,7 +1,7 @@ package besom.internal import besom.util.NonEmptyString -import besom.types.* +import besom.types.{URN, ResourceId, ResourceType} import com.google.protobuf.struct.* import scala.deriving.Mirror import scala.annotation.implicitNotFound @@ -26,7 +26,8 @@ sealed trait Resource: // this method can lead to deadlocks as it waits for URN to be resolved, use carefully // resources can be visually compared by references using toString() if URN is not strictly required - private[internal] def asString: Result[Option[String]] = urn.getValue.map(_.map(v => s"${this.getClass.getSimpleName}($v)")) + private[internal] def asString(using Context): Result[Option[String]] = + urn.getValue.map(_.map(v => s"${this.getClass.getSimpleName}($v)")) trait CustomResource extends Resource: /** @return @@ -50,7 +51,7 @@ trait ComponentResource(using private[besom] def componentBase: ComponentBase = base trait ProviderResource extends CustomResource: - private[internal] def registrationId: Result[String] = + private[internal] def registrationId(using Context): Result[String] = for urn <- urn.getValueOrElse(URN.empty) id <- id.getValueOrElse(Constants.UnknownStringValue) diff --git a/core/src/main/scala/besom/internal/ResourceOptions.scala b/core/src/main/scala/besom/internal/ResourceOptions.scala index 96c746d5..442b8e2c 100644 --- a/core/src/main/scala/besom/internal/ResourceOptions.scala +++ b/core/src/main/scala/besom/internal/ResourceOptions.scala @@ -34,7 +34,7 @@ sealed trait ResolvedResourceOptions: def pluginDownloadUrl: Option[String] def deletedWith: Option[Resource] - private[besom] def getImportId(using Context): Option[ResourceId] = this match + private[besom] def getImportId: Option[ResourceId] = this match case cr: CustomResolvedResourceOptions => cr.importId case sr: StackReferenceResolvedResourceOptions => sr.importId case _ => None @@ -189,9 +189,9 @@ sealed trait ResourceOptions: } end resolve - private[besom] def hasURN: Result[Boolean] = urn.map(_.isDefined).getValueOrElse(false) + private[besom] def hasURN(using Context): Result[Boolean] = urn.map(_.isDefined).getValueOrElse(false) - private[besom] def getURN: Result[URN] = urn.getValueOrElse(None).flatMap { + private[besom] def getURN(using Context): Result[URN] = urn.getValueOrElse(None).flatMap { case Some(urn) => Result.pure(urn) case None => Result.fail(Exception("URN is not defined")) } @@ -232,7 +232,7 @@ final case class StackReferenceResourceOptions private[internal] ( export common.* trait CustomResourceOptionsFactory: - def apply(using Context)( + def apply( parent: Input.Optional[Resource] = None, dependsOn: Input.OneOrIterable[Resource] = Iterable.empty, deletedWith: Input.Optional[Resource] = None, @@ -270,7 +270,7 @@ trait CustomResourceOptionsFactory: ) object CustomResourceOptions: - def apply(using Context)( + def apply( parent: Input.Optional[Resource] = None, dependsOn: Input.OneOrIterable[Resource] = Iterable.empty, deletedWith: Input.Optional[Resource] = None, @@ -314,7 +314,7 @@ object CustomResourceOptions: end CustomResourceOptions trait ComponentResourceOptionsFactory: - def apply(using Context)( + def apply( providers: Input.OneOrIterable[ProviderResource] = Iterable.empty, parent: Input.Optional[Resource] = None, dependsOn: Input.OneOrIterable[Resource] = Iterable.empty, @@ -346,7 +346,7 @@ trait ComponentResourceOptionsFactory: ) object ComponentResourceOptions: - def apply(using Context)( + def apply( providers: Input.OneOrIterable[ProviderResource] = Iterable.empty, parent: Input.Optional[Resource] = None, dependsOn: Input.OneOrIterable[Resource] = Iterable.empty, @@ -379,7 +379,7 @@ object ComponentResourceOptions: new ComponentResourceOptions(common, providers.asManyOutput()) object StackReferenceResourceOptions: - def apply(using Context)( + def apply( parent: Input.Optional[Resource] = None, dependsOn: Input.OneOrIterable[Resource] = Iterable.empty, protect: Input[Boolean] = false, @@ -412,7 +412,7 @@ object StackReferenceResourceOptions: new StackReferenceResourceOptions(common, importId.asOptionOutput()) trait StackReferenceResourceOptionsFactory: - def apply(using Context)( + def apply( parent: Input.Optional[Resource] = None, dependsOn: Input.OneOrIterable[Resource] = Iterable.empty, protect: Input[Boolean] = false, diff --git a/core/src/main/scala/besom/internal/ResourceState.scala b/core/src/main/scala/besom/internal/ResourceState.scala index a67c9bf1..b4068b10 100644 --- a/core/src/main/scala/besom/internal/ResourceState.scala +++ b/core/src/main/scala/besom/internal/ResourceState.scala @@ -1,7 +1,7 @@ package besom.internal import besom.util.* -import besom.types.* +import besom.types.{ResourceType, ResourceId, Label} sealed trait ResourceState: def children: Set[Resource] diff --git a/core/src/main/scala/besom/internal/Result.scala b/core/src/main/scala/besom/internal/Result.scala index bc9d5a94..f35f1dbb 100644 --- a/core/src/main/scala/besom/internal/Result.scala +++ b/core/src/main/scala/besom/internal/Result.scala @@ -69,7 +69,8 @@ trait Promise[A]: object Promise: def apply[A](): Result[Promise[A]] = Result.defer { new Promise: - private val internal = scala.concurrent.Promise[A]() + private val internal = scala.concurrent.Promise[A]() + override def get: Result[A] = Result.deferFuture(internal.future) override def isCompleted: Result[Boolean] = Result.defer(internal.isCompleted) override def fulfill(a: A): Result[Unit] = Result.defer(internal.success(a)) diff --git a/core/src/main/scala/besom/internal/RunInfo.scala b/core/src/main/scala/besom/internal/RunInfo.scala index fcedab92..2ea5efaa 100644 --- a/core/src/main/scala/besom/internal/RunInfo.scala +++ b/core/src/main/scala/besom/internal/RunInfo.scala @@ -4,6 +4,7 @@ import besom.internal.logging.{LocalBesomLogger => logger} import besom.util.NonEmptyString import scala.util.Try import besom.util.* +import besom.internal.logging.BesomMDC case class RunInfo( organization: Option[NonEmptyString], @@ -35,9 +36,11 @@ object RunInfo: }) .transformM { case Left(error) => + given BesomMDC[_] = BesomMDC.empty logger.error(s"Error during initial run configuration resolution: ${error.getMessage}") *> Result.pure(Left(error)) case Right(runInfo) => + given BesomMDC[_] = BesomMDC.empty logger.debug(s"Run configuration resolved successfully!") *> logger.trace(s"${printer.render(runInfo)}") *> Result.pure(Right(runInfo)) } diff --git a/core/src/main/scala/besom/internal/StackReference.scala b/core/src/main/scala/besom/internal/StackReference.scala index f2cd3a13..113c931c 100644 --- a/core/src/main/scala/besom/internal/StackReference.scala +++ b/core/src/main/scala/besom/internal/StackReference.scala @@ -1,8 +1,8 @@ package besom.internal import besom.json.* -import besom.types.* import besom.util.NonEmptyString +import besom.types.{URN, ResourceId} case class StackReference( urn: Output[URN], @@ -13,29 +13,33 @@ case class StackReference( ) extends CustomResource derives ResourceDecoder: - def getOutput(name: NonEmptyString)(using Context): Output[Option[JsValue]] = - getOutput(Output(name)) + def getOutput(name: NonEmptyString): Output[Option[JsValue]] = + getOutput(Output.pure(name)) def getOutput(name: Output[NonEmptyString]): Output[Option[JsValue]] = val output = name.zip(outputs).map { case (name, outputs) => outputs.get(name) } - output.withIsSecret(isSecretOutputName(name)) + Output.getContext.flatMap { ctx => + output.withIsSecret(isSecretOutputName(name)(using ctx)) + } - def requireOutput(name: NonEmptyString)(using Context): Output[JsValue] = - requireOutput(Output(name)) + def requireOutput(name: NonEmptyString): Output[JsValue] = + requireOutput(Output.pure(name)) - def requireOutput(name: Output[NonEmptyString])(using Context): Output[JsValue] = + def requireOutput(name: Output[NonEmptyString]): Output[JsValue] = val output = name.zip(outputs).flatMap { case (name, outputs) => outputs.get(name) match - case Some(value) => Output(value) + case Some(value) => Output.pure(value) case None => Output.fail(Exception(s"Missing required output '$name'")) } - output.withIsSecret(isSecretOutputName(name)) + Output.getContext.flatMap { ctx => + output.withIsSecret(isSecretOutputName(name)(using ctx)) + } - private def isSecretOutputName(name: Output[String]): Result[Boolean] = + private def isSecretOutputName(name: Output[String])(using Context): Result[Boolean] = for nameOd <- name.getData namesOd <- secretOutputNames.getData @@ -53,7 +57,7 @@ end StackReference trait StackReferenceFactory: sealed trait StackReferenceType[T]: type Out[T] - def transform(stackReference: StackReference)(using Context): Output[Out[T]] + def transform(stackReference: StackReference): Output[Out[T]] object StackReferenceType: given untyped: UntypedStackReferenceType = UntypedStackReferenceType() @@ -62,7 +66,7 @@ trait StackReferenceFactory: class TypedStackReferenceType[T](using JsonReader[T]) extends StackReferenceType[T]: type Out[T] = TypedStackReference[T] - def transform(stackReference: StackReference)(using Context): Output[Out[T]] = + def transform(stackReference: StackReference): Output[Out[T]] = val objectOutput: Output[T] = requireObject(stackReference.outputs, stackReference.secretOutputNames) @@ -78,36 +82,38 @@ trait StackReferenceFactory: class UntypedStackReferenceType extends StackReferenceType[Any]: type Out[T] = StackReference - def transform(stackReference: StackReference)(using Context): Output[StackReference] = Output(stackReference) + def transform(stackReference: StackReference): Output[StackReference] = Output.pure(stackReference) - def untypedStackReference(using Context): StackReferenceType[Any] = UntypedStackReferenceType() + def untypedStackReference: StackReferenceType[Any] = UntypedStackReferenceType() def typedStackReference[T: JsonReader]: TypedStackReferenceType[T] = TypedStackReferenceType() - def apply[T](using stackRefType: StackReferenceType[T], ctx: Context)( + def apply[T]( name: NonEmptyString, args: Input.Optional[StackReferenceArgs] = None, opts: StackReferenceResourceOptions = StackReferenceResourceOptions() - ): Output[stackRefType.Out[T]] = + )(using stackRefType: StackReferenceType[T]): Output[stackRefType.Out[T]] = args .asOptionOutput(false) .flatMap { case Some(stackRefArgs) => stackRefArgs.name - case None => Output(name) + case None => Output.pure(name) } .flatMap { selectedName => val importId = ResourceId.unsafeOf(selectedName) val stackRefArgs = StackReferenceArgs( - Output(selectedName) + Output.pure(selectedName) ) val mergedOpts = new StackReferenceResourceOptions( // use constructor directly to avoid apply opts.common, - Output(Some(importId)) + Output.pure(Some(importId)) ) - Context().readOrRegisterResource[StackReference, StackReferenceArgs]("pulumi:pulumi:StackReference", name, stackRefArgs, mergedOpts) + Output.getContext.flatMap { implicit ctx => + ctx.readOrRegisterResource[StackReference, StackReferenceArgs]("pulumi:pulumi:StackReference", name, stackRefArgs, mergedOpts) + } } .flatMap(stackRefType.transform) @@ -115,11 +121,14 @@ trait StackReferenceFactory: outputs: Output[Map[String, JsValue]], secretOutputNames: Output[Set[String]] ): Output[T] = - outputs - .map(JsObject(_).convertTo[T]) - .withIsSecret( - secretOutputNames - .map(_.nonEmpty) - .getValueOrElse(false) - ) + Output.getContext.flatMap { ctx => + outputs + .map(JsObject(_).convertTo[T]) + .withIsSecret( + secretOutputNames + .map(_.nonEmpty) + .getValueOrElse(false)(using ctx) + ) + } + end StackReferenceFactory diff --git a/core/src/main/scala/besom/internal/TypedStackReference.scala b/core/src/main/scala/besom/internal/TypedStackReference.scala index 0ccf2adc..6d12cbb0 100644 --- a/core/src/main/scala/besom/internal/TypedStackReference.scala +++ b/core/src/main/scala/besom/internal/TypedStackReference.scala @@ -1,6 +1,6 @@ package besom.internal -import besom.types.* +import besom.types.{ResourceId, URN} case class TypedStackReference[T]( urn: Output[URN], diff --git a/core/src/main/scala/besom/internal/codecs.scala b/core/src/main/scala/besom/internal/codecs.scala index 915100aa..fb7cd8a1 100644 --- a/core/src/main/scala/besom/internal/codecs.scala +++ b/core/src/main/scala/besom/internal/codecs.scala @@ -1,7 +1,7 @@ package besom.internal import besom.internal.ProtobufUtil.{*, given} -import besom.types.* +import besom.types.{Label, URN, Archive, Asset, AssetOrArchive, ResourceId} import besom.types.Archive.* import besom.types.Asset.* import besom.util.Validated.* @@ -246,7 +246,7 @@ object Decoder extends DecoderInstancesLowPrio1: .decode(value, label) .redeem( errs => OutputData(Output.fail(AggregatedDecodingError(errs))), - _.map(Output(_)) + _.map(Output.pure(_)) ) override def mapping(value: Value, label: Label): Validated[DecodingError, Output[A]] = ??? @@ -468,7 +468,7 @@ object Decoder extends DecoderInstancesLowPrio1: error(s"$label: Expected a resource urn in resource struct, not found", label) ) .flatMap(urnString => URN.from(urnString).toEither.toValidatedResult) - .map(urn => OutputData(DependencyResource(Output(urn)))) + .map(urn => OutputData(DependencyResource(Output.pure(urn)))) case Some(sig) => error(s"$label: Expected a special resource signature, got: '$sig'", label).invalidResult } @@ -797,7 +797,7 @@ trait DecoderHelpers: val l = depsLabel.atIndex(i) v.getStringValue.validResult .flatMap(URN.from(_).toEither.left.map(e => error(s"$l: Expected a valid URN string", l, e)).toValidatedResult) - .map(urn => DependencyResource(Output(urn))) + .map(urn => DependencyResource(Output.pure(urn))) } .foldLeft[ValidatedResult[DecodingError, Vector[Resource]]](ValidatedResult.valid(Vector.empty)) { (acc, vr) => acc.zipWith(vr) { (acc, v) => @@ -1034,7 +1034,7 @@ object Encoder: } } - private def urns(r: Set[Resource]): Result[List[URN]] = Result + private def urns(r: Set[Resource])(using Context): Result[List[URN]] = Result .sequence { r.toList.map(_.urn.getValue) } diff --git a/core/src/main/scala/besom/internal/logging.scala b/core/src/main/scala/besom/internal/logging.scala index 67449b68..8f8c3500 100644 --- a/core/src/main/scala/besom/internal/logging.scala +++ b/core/src/main/scala/besom/internal/logging.scala @@ -114,60 +114,107 @@ object logging: ): Result[Unit] = log(makeLogRecord(level, messages.toList, pkg, fileName, name, line, mdc), urn, streamId, ephemeral) + // TODO resource-less methods + + def trace(message: LoggableMessage)(using + pkg: sourcecode.Pkg, + fileName: sourcecode.FileName, + name: sourcecode.Name, + line: sourcecode.Line, + mdc: BesomMDC[_] + ): Result[Unit] = log(Level.Trace, mdc, URN.empty, 0, false, message) + def trace(message: LoggableMessage, res: Option[Resource] = None, streamId: Int = 0, ephemeral: Boolean = false)(using pkg: sourcecode.Pkg, fileName: sourcecode.FileName, name: sourcecode.Name, line: sourcecode.Line, - mdc: BesomMDC[_] = BesomMDC.empty + mdc: BesomMDC[_] = BesomMDC.empty, + ctx: Context ): Result[Unit] = res match case Some(r) => r.urn.getValueOrElse(URN.empty).flatMap(urn => log(Level.Trace, mdc, urn, streamId, ephemeral, message)) case None => log(Level.Trace, mdc, URN.empty, streamId, ephemeral, message) + def debug(message: LoggableMessage)(using + pkg: sourcecode.Pkg, + fileName: sourcecode.FileName, + name: sourcecode.Name, + line: sourcecode.Line, + mdc: BesomMDC[_] + ): Result[Unit] = log(Level.Debug, mdc, URN.empty, 0, false, message) + def debug(message: LoggableMessage, res: Option[Resource] = None, streamId: Int = 0, ephemeral: Boolean = false)(using pkg: sourcecode.Pkg, fileName: sourcecode.FileName, name: sourcecode.Name, line: sourcecode.Line, - mdc: BesomMDC[_] = BesomMDC.empty + mdc: BesomMDC[_] = BesomMDC.empty, + ctx: Context ): Result[Unit] = res match case Some(r) => r.urn.getValueOrElse(URN.empty).flatMap(urn => log(Level.Debug, mdc, urn, streamId, ephemeral, message)) case None => log(Level.Debug, mdc, URN.empty, streamId, ephemeral, message) + def info(message: LoggableMessage)(using + pkg: sourcecode.Pkg, + fileName: sourcecode.FileName, + name: sourcecode.Name, + line: sourcecode.Line, + mdc: BesomMDC[_] + ): Result[Unit] = log(Level.Info, mdc, URN.empty, 0, false, message) + def info(message: LoggableMessage, res: Option[Resource] = None, streamId: Int = 0, ephemeral: Boolean = false)(using pkg: sourcecode.Pkg, fileName: sourcecode.FileName, name: sourcecode.Name, line: sourcecode.Line, - mdc: BesomMDC[_] = BesomMDC.empty + mdc: BesomMDC[_] = BesomMDC.empty, + ctx: Context ): Result[Unit] = res match case Some(r) => r.urn.getValueOrElse(URN.empty).flatMap(urn => log(Level.Info, mdc, urn, streamId, ephemeral, message)) case None => log(Level.Info, mdc, URN.empty, streamId, ephemeral, message) + def warn(message: LoggableMessage)(using + pkg: sourcecode.Pkg, + fileName: sourcecode.FileName, + name: sourcecode.Name, + line: sourcecode.Line, + mdc: BesomMDC[_] + ): Result[Unit] = log(Level.Warn, mdc, URN.empty, 0, false, message) + def warn(message: LoggableMessage, res: Option[Resource] = None, streamId: Int = 0, ephemeral: Boolean = false)(using pkg: sourcecode.Pkg, fileName: sourcecode.FileName, name: sourcecode.Name, line: sourcecode.Line, - mdc: BesomMDC[_] = BesomMDC.empty + mdc: BesomMDC[_] = BesomMDC.empty, + ctx: Context ): Result[Unit] = res match case Some(r) => r.urn.getValueOrElse(URN.empty).flatMap(urn => log(Level.Warn, mdc, urn, streamId, ephemeral, message)) case None => log(Level.Warn, mdc, URN.empty, streamId, ephemeral, message) + def error(message: LoggableMessage)(using + pkg: sourcecode.Pkg, + fileName: sourcecode.FileName, + name: sourcecode.Name, + line: sourcecode.Line, + mdc: BesomMDC[_] + ): Result[Unit] = log(Level.Error, mdc, URN.empty, 0, false, message) + def error(message: LoggableMessage, res: Option[Resource] = None, streamId: Int = 0, ephemeral: Boolean = false)(using pkg: sourcecode.Pkg, fileName: sourcecode.FileName, name: sourcecode.Name, line: sourcecode.Line, - mdc: BesomMDC[_] = BesomMDC.empty + mdc: BesomMDC[_] = BesomMDC.empty, + ctx: Context ): Result[Unit] = res match case Some(r) => @@ -188,7 +235,7 @@ object logging: name: sourcecode.Name, line: sourcecode.Line, mdc: MDC = MDC.empty - ): Output[Unit] = Output { + ): Output[Unit] = Output.ofResult { res match case Some(r) => r.urn @@ -203,7 +250,7 @@ object logging: name: sourcecode.Name, line: sourcecode.Line, mdc: MDC = MDC.empty - ): Output[Unit] = Output { + ): Output[Unit] = Output.ofResult { res match case Some(r) => r.urn @@ -218,7 +265,7 @@ object logging: name: sourcecode.Name, line: sourcecode.Line, mdc: MDC = MDC.empty - ): Output[Unit] = Output { + ): Output[Unit] = Output.ofResult { res match case Some(r) => r.urn @@ -233,7 +280,7 @@ object logging: name: sourcecode.Name, line: sourcecode.Line, mdc: MDC = MDC.empty - ): Output[Unit] = Output { + ): Output[Unit] = Output.ofResult { res match case Some(r) => r.urn @@ -248,7 +295,7 @@ object logging: name: sourcecode.Name, line: sourcecode.Line, mdc: MDC = MDC.empty - ): Output[Unit] = Output { + ): Output[Unit] = Output.ofResult { res match case Some(r) => r.urn diff --git a/core/src/main/scala/besom/internal/resources.scala b/core/src/main/scala/besom/internal/resources.scala index b1d2b197..b23dc967 100644 --- a/core/src/main/scala/besom/internal/resources.scala +++ b/core/src/main/scala/besom/internal/resources.scala @@ -2,7 +2,7 @@ package besom.internal class ResourceStateMismatchException(msg: String) extends Exception(msg) object ResourceStateMismatchException: - def fail(r: Resource, state: ResourceState, expected: String)(using dbg: Debug): Result[Nothing] = + def fail(r: Resource, state: ResourceState, expected: String)(using ctx: Context, dbg: Debug): Result[Nothing] = (for rstr <- r.asString msg = s"state for resource $r / ${rstr.getOrElse("???")} is $state, expected $expected, caller: $dbg" @@ -11,7 +11,7 @@ object ResourceStateMismatchException: class ResourceStateMissingException(msg: String) extends Exception(msg) object ResourceStateMissingException: inline private def nl = System.lineSeparator - def fail(r: Resource, rs: Map[Resource, ResourceState])(using dbg: Debug): Result[Nothing] = + def fail(r: Resource, rs: Map[Resource, ResourceState])(using ctx: Context, dbg: Debug): Result[Nothing] = (for rstr <- r.asString msg = s"state for resource $r / ${rstr.getOrElse("???")} not found$nl - caller: $dbg$nl - state available for resources:$nl${rs.keys @@ -31,7 +31,7 @@ class Resources private (private val resources: Ref[Map[Resource, ResourceState] def add(resource: RemoteComponentResource, state: ComponentResourceState): Result[Unit] = resources.update(_ + (resource -> state)) - def add(resource: Resource, state: ResourceState): Result[Unit] = (resource, state) match + def add(resource: Resource, state: ResourceState)(using Context): Result[Unit] = (resource, state) match case (pr: ProviderResource, prs: ProviderResourceState) => add(pr, prs) case (cr: CustomResource, crs: CustomResourceState) => @@ -43,7 +43,7 @@ class Resources private (private val resources: Ref[Map[Resource, ResourceState] case _ => resource.asString.flatMap(s => Result.fail(Exception(s"resource ${s} and state ${state} don't match"))) - def getStateFor(resource: ProviderResource)(using Debug): Result[ProviderResourceState] = + def getStateFor(resource: ProviderResource)(using Context, Debug): Result[ProviderResourceState] = resources.get.flatMap { rs => rs.get(resource) match case Some(state) => @@ -55,7 +55,7 @@ class Resources private (private val resources: Ref[Map[Resource, ResourceState] ResourceStateMissingException.fail(resource, rs) } - def getStateFor(resource: CustomResource)(using Debug): Result[CustomResourceState] = + def getStateFor(resource: CustomResource)(using Context, Debug): Result[CustomResourceState] = resources.get.flatMap { rs => rs.get(resource) match case Some(state) => @@ -67,7 +67,7 @@ class Resources private (private val resources: Ref[Map[Resource, ResourceState] ResourceStateMissingException.fail(resource, rs) } - def getStateFor(resource: ComponentResource)(using Debug): Result[ComponentResourceState] = + def getStateFor(resource: ComponentResource)(using Context, Debug): Result[ComponentResourceState] = resources.get.flatMap { rs => rs.get(resource.componentBase) match case Some(state) => @@ -79,7 +79,7 @@ class Resources private (private val resources: Ref[Map[Resource, ResourceState] ResourceStateMissingException.fail(resource, rs) } - def getStateFor(resource: Resource)(using dbg: Debug): Result[ResourceState] = + def getStateFor(resource: Resource)(using ctx: Context, dbg: Debug): Result[ResourceState] = resources.get.flatMap { rs => resource match case compr: ComponentResource => diff --git a/core/src/main/scala/besom/types.scala b/core/src/main/scala/besom/types.scala index dc2b85e2..d21d2dd2 100644 --- a/core/src/main/scala/besom/types.scala +++ b/core/src/main/scala/besom/types.scala @@ -226,8 +226,8 @@ object types: else throw IllegalArgumentException(s"URN $s is not valid") } - def parse(value: String)(using besom.internal.Context): Output[URN] = - besom.internal.Output(besom.internal.Result.evalTry(besom.types.URN.from(value))) + def parse(value: String): Output[URN] = + besom.internal.Output.ofResult(besom.internal.Result.evalTry(besom.types.URN.from(value))) extension (urn: URN) /** @return diff --git a/core/src/main/scala/besom/util/JsonInterpolator.scala b/core/src/main/scala/besom/util/JsonInterpolator.scala index 617107c7..908a16ce 100644 --- a/core/src/main/scala/besom/util/JsonInterpolator.scala +++ b/core/src/main/scala/besom/util/JsonInterpolator.scala @@ -1,7 +1,7 @@ package besom.util import besom.json.* -import besom.internal.{Context, Output} +import besom.internal.Output import scala.util.{Failure, Success} import interpolator.interleave import java.util.Objects @@ -12,10 +12,9 @@ object JsonInterpolator: private val NL = System.lineSeparator() - extension (inline sc: StringContext) - inline def json(inline args: Any*)(using ctx: besom.internal.Context): Output[JsValue] = ${ jsonImpl('sc, 'args, 'ctx) } + extension (inline sc: StringContext) inline def json(inline args: Any*): Output[JsValue] = ${ jsonImpl('sc, 'args) } - private def jsonImpl(sc: Expr[StringContext], args: Expr[Seq[Any]], ctx: Expr[Context])(using Quotes): Expr[Output[JsValue]] = + private def jsonImpl(sc: Expr[StringContext], args: Expr[Seq[Any]])(using Quotes): Expr[Output[JsValue]] = import quotes.reflect.* def defaultFor(field: Expr[Any], tpe: Type[_], wrappers: List[Type[_]] = Nil): Any = tpe match @@ -64,7 +63,7 @@ object JsonInterpolator: arg match case '{ $arg: String } => '{ - Output($arg)(using $ctx).map { str => + Output.pure($arg).map { str => val sb = java.lang.StringBuilder() if str == null then JsNull else @@ -73,20 +72,20 @@ object JsonInterpolator: JsString(str) } } - case '{ $arg: Int } => '{ Output(JsNumber($arg))(using $ctx) } - case '{ $arg: Short } => '{ Output(JsNumber($arg))(using $ctx) } - case '{ $arg: Long } => '{ Output(JsNumber($arg))(using $ctx) } - case '{ $arg: Float } => '{ Output(JsNumber($arg))(using $ctx) } - case '{ $arg: Double } => '{ Output(JsNumber($arg))(using $ctx) } - case '{ $arg: Boolean } => '{ Output(JsBoolean($arg))(using $ctx) } - case '{ $arg: JsValue } => '{ Output($arg)(using $ctx) } + case '{ $arg: Int } => '{ Output.pure(JsNumber($arg)) } + case '{ $arg: Short } => '{ Output.pure(JsNumber($arg)) } + case '{ $arg: Long } => '{ Output.pure(JsNumber($arg)) } + case '{ $arg: Float } => '{ Output.pure(JsNumber($arg)) } + case '{ $arg: Double } => '{ Output.pure(JsNumber($arg)) } + case '{ $arg: Boolean } => '{ Output.pure(JsBoolean($arg)) } + case '{ $arg: JsValue } => '{ Output.pure($arg) } case _ => arg.asTerm.tpe.asType match case '[Output[Option[t]]] => '{ $arg.asInstanceOf[Output[Option[t]]].flatMap { case Some(value) => ${ convert('value) } - case None => Output(JsNull)(using $ctx) + case None => Output.pure(JsNull) } } case '[Output[t]] => @@ -100,7 +99,7 @@ object JsonInterpolator: '{ $arg.asInstanceOf[Option[t]] match case Some(value) => ${ convert('value) } - case None => Output(JsNull)(using $ctx) + case None => Output.pure(JsNull) } case '[t] => @@ -119,13 +118,13 @@ object JsonInterpolator: case Varargs(argExprs) => if argExprs.isEmpty then parts.map(_.valueOrAbort).mkString match - case "" => '{ Output(JsObject.empty)(using $ctx) } + case "" => '{ Output.pure(JsObject.empty) } case str => scala.util.Try(JsonParser(str)) match case Failure(exception) => report.errorAndAbort(s"Failed to parse JSON:$NL ${exception.getMessage}") case Success(value) => - '{ Output(JsonParser(ParserInput.apply(${ Expr(str) })))(using $ctx) } + '{ Output.pure(JsonParser(ParserInput.apply(${ Expr(str) }))) } else val defaults = argExprs.map { arg => defaultFor(arg, arg.asTerm.tpe.asType) @@ -144,7 +143,7 @@ object JsonInterpolator: '{ interleave(${ liftedParts }.toList, ${ liftedExprOfSeq }.toList) - .foldLeft(Output("")(using $ctx)) { case (acc, e) => + .foldLeft(Output.pure("")) { case (acc, e) => e match case o: Output[?] => acc.flatMap(s => o.map(v => s + Objects.toString(v))) // handle nulls too case s: String => acc.map(_ + s) diff --git a/core/src/main/scala/besom/util/JsonReaderInstances.scala b/core/src/main/scala/besom/util/JsonReaderInstances.scala index fa77577a..a5a16eb3 100644 --- a/core/src/main/scala/besom/util/JsonReaderInstances.scala +++ b/core/src/main/scala/besom/util/JsonReaderInstances.scala @@ -14,7 +14,7 @@ object JsonReaderInstances: val maybeInnerValue = fields.get(Constants.ValueName) maybeInnerValue .map { innerValue => - try Output(jsonReader.read(innerValue)) + try Output.pure(jsonReader.read(innerValue)) catch case e: Throwable => Output.fail(e) } .getOrElse(Output.fail(Exception("Invalid JSON"))) diff --git a/core/src/main/scala/besom/util/NonEmptyString.scala b/core/src/main/scala/besom/util/NonEmptyString.scala index dd906ded..26bdd88d 100644 --- a/core/src/main/scala/besom/util/NonEmptyString.scala +++ b/core/src/main/scala/besom/util/NonEmptyString.scala @@ -30,7 +30,7 @@ object NonEmptyString: inline def asString: String = nes object OutputOps: - import besom.internal.{Output, Context} + import besom.internal.Output import besom.util.interpolator.* inline def fromStringOutput(inline s: Output[String]): Output[NonEmptyString] = ${ fromStringOutputImpl('s) } @@ -47,9 +47,9 @@ object NonEmptyString: else report.errorAndAbort("This interpolated string is possibly empty, empty strings are not allowed here!") expr match - case '{ scala.StringContext.apply(${ Varargs(parts) }: _*).p(${ Varargs(_) }: _*)(using ${ xd }: Context) } => + case '{ scala.StringContext.apply(${ Varargs(parts) }: _*).p(${ Varargs(_) }: _*) } => handleParts(parts) - case '{ scala.StringContext.apply(${ Varargs(parts) }: _*).pulumi(${ Varargs(_) }: _*)(using ${ xd }: Context) } => + case '{ scala.StringContext.apply(${ Varargs(parts) }: _*).pulumi(${ Varargs(_) }: _*) } => handleParts(parts) case _ => report.errorAndAbort( @@ -170,8 +170,8 @@ object NonEmptyString: implicit inline def str2NonEmptyString(inline s: String): NonEmptyString = NonEmptyString.from(s) - import besom.internal.{Output, Context} - implicit inline def outputStr2OutputNonEmptyString(inline s: Output[String])(using Context): Output[NonEmptyString] = + import besom.internal.Output + implicit inline def outputStr2OutputNonEmptyString(inline s: Output[String]): Output[NonEmptyString] = OutputOps.fromStringOutput(s) end NonEmptyString diff --git a/core/src/main/scala/besom/util/interpolator.scala b/core/src/main/scala/besom/util/interpolator.scala index a909dfb6..ca4b0a35 100644 --- a/core/src/main/scala/besom/util/interpolator.scala +++ b/core/src/main/scala/besom/util/interpolator.scala @@ -9,14 +9,14 @@ object interpolator: case (x :: xs, y :: ys) => x :: y :: interleave(xs, ys) implicit final class PulumiInterpolationOps(sc: StringContext): - def pulumi(args: Any*)(using Context): Output[String] = - interleave(sc.parts.toList, args.toList).foldLeft(Output("")) { case (acc, e) => + def pulumi(args: Any*): Output[String] = + interleave(sc.parts.toList, args.toList).foldLeft(Output.pure("")) { case (acc, e) => e match case o: Output[?] => acc.flatMap(s => o.map(s + _.toString)) case s: Any => acc.map(_ + s.toString) } - def p(args: Any*)(using Context): Output[String] = pulumi(args*) + def p(args: Any*): Output[String] = pulumi(args*) implicit final class OutputStringStripMarginOps(output: Output[String]): def stripMargin: Output[String] = output.map(_.stripMargin) diff --git a/core/src/test/scala/besom/internal/CodegenTest.scala b/core/src/test/scala/besom/internal/CodegenTest.scala index 1bafeb7c..6d75c9c4 100644 --- a/core/src/test/scala/besom/internal/CodegenTest.scala +++ b/core/src/test/scala/besom/internal/CodegenTest.scala @@ -1,7 +1,8 @@ package besom.internal import besom.* -import besom.internal.RunResult.{*, given} +import besom.internal.RunOutput.{*, given} +import besom.json.JsString class CodegenTest extends munit.FunSuite: @@ -12,5 +13,9 @@ class CodegenTest extends munit.FunSuite: given Context = DummyContext(configMap = nonEmptyKeyConfigMap, configSecretKeys = Set()).unsafeRunSync() import CodegenProtocol.* - Codegen.config[Map[String, PulumiAny]]("provider")("key", false, List(), None) + + Codegen.config[Map[String, PulumiAny]]("provider")("key", false, List(), None).unsafeRunSync() match + case None => fail("Expected config to be defined") + case Some(None) => fail("Expected config to be defined") + case Some(Some(map: Map[String, PulumiAny])) => assertEquals(map, Map("a" -> JsString("b"))) } diff --git a/core/src/test/scala/besom/internal/ContextPropagationTest.scala b/core/src/test/scala/besom/internal/ContextPropagationTest.scala new file mode 100644 index 00000000..4d706e94 --- /dev/null +++ b/core/src/test/scala/besom/internal/ContextPropagationTest.scala @@ -0,0 +1,121 @@ +package besom.internal + +import besom.types.{URN, ResourceId, ResourceType} +import RunOutput.{*, given} +import ProtobufUtil.given + +import pulumirpc.resource.{RegisterResourceRequest, RegisterResourceResponse, RegisterResourceOutputsRequest} +import com.google.protobuf.struct.Struct +import com.google.protobuf.struct.* +import besom.util.NonEmptyString + +class ContextPropagationTest extends munit.FunSuite: + + case class TestResource(urn: Output[URN], id: Output[ResourceId], url: Output[String]) extends CustomResource derives ResourceDecoder + object TestResource extends ResourceCompanion[TestResource]: + val typeToken: ResourceType = ResourceType.unsafeOf("test:resource:TestResource") + def apply(name: NonEmptyString): Output[TestResource] = Output.getContext.flatMap { implicit ctx => + ctx.readOrRegisterResource[TestResource, EmptyArgs]( + typeToken, + name, + EmptyArgs(), + CustomResourceOptions() + ) + } + + case class TestComponentResource(url: Output[String])(using ComponentBase) extends ComponentResource + object TestComponentResource extends ResourceCompanion[TestComponentResource]: + val typeToken: ResourceType = ResourceType.unsafeOf("test:component:TestComponentResource") + + test("context propagation - plain resource, no parent") { + val stackUrn = URN( + "urn:pulumi:stack::project::stack:Stack$besom:testing/test:Stack::test-stack" + ) + val resourceUrn = URN("urn:pulumi:stack::project::custom:resources:Resource$besom:testing/test:Resource::test-resource") + val spyMonitor = new DummyContext.DummyMonitor: + override def registerResource(registerResourceRequest: RegisterResourceRequest): Result[RegisterResourceResponse] = Result.defer { + assert(registerResourceRequest.parent == stackUrn.asString) + + val obj: Struct = Map("url" -> "https://test.com".asValue).asStruct + + RegisterResourceResponse(urn = resourceUrn.asString, `object` = Some(obj), id = "test-id") + } + + val ctx: Context = DummyContext(monitor = spyMonitor, stackURN = stackUrn).unsafeRunSync() + + val resource = TestResource("test-resource").unsafeRunSync()(using ctx) + + resource match + case None => fail("Expected resource to be defined") + case Some(res) => + res.urn.getValue(using ctx).unsafeRunSync() match + case Some(urn) => + assert(urn == resourceUrn) + case None => fail("Expected resource urn to be defined") + + res.id.getValue(using ctx).unsafeRunSync() match + case Some(id) => + assert(id == ResourceId.unsafeOf("test-id")) + case None => fail("Expected resource id to be defined") + + res.url.getValue(using ctx).unsafeRunSync() match + case Some(url) => + assert(url == "https://test.com") + case None => fail("Expected resource url to be defined") + } + + test("context propagation - resource in component") { + val stackUrn = URN( + "urn:pulumi:stack::project::stack:Stack$besom:testing/test:Stack::test-stack" + ) + val componentUrn = URN("urn:pulumi:stack::project::custom:components:Component$besom:testing/test:Component::test-component") + + val resourceUrn = URN("urn:pulumi:stack::project::custom:resources:Resource$besom:testing/test:Resource::test-resource") + + val spyMonitor = new DummyContext.DummyMonitor: + override def registerResource(registerResourceRequest: RegisterResourceRequest): Result[RegisterResourceResponse] = Result.defer { + registerResourceRequest.`type` -> registerResourceRequest.name match + case (TestComponentResource.typeToken, "test-component") => + assert(registerResourceRequest.parent == stackUrn.asString) + + val obj: Struct = Map.empty[String, Value].asStruct + + RegisterResourceResponse(urn = componentUrn.asString, `object` = Some(obj)) + case (TestResource.typeToken, "test-resource") => + assert(registerResourceRequest.parent == componentUrn.asString) + + val obj: Struct = Map("url" -> "https://test.com".asValue).asStruct + + RegisterResourceResponse(urn = resourceUrn.asString, `object` = Some(obj), id = "test-id") + + case _ => + fail("Unexpected resource type") + } + + override def registerResourceOutputs(registerResourceOutputsRequest: RegisterResourceOutputsRequest): Result[Unit] = + Result.pure(()) + + val ctx: Context = DummyContext(monitor = spyMonitor, stackURN = stackUrn).unsafeRunSync() + + val comp = besom + .component("test-component", TestComponentResource.typeToken, ComponentResourceOptions()) { + val nested = TestResource("test-resource") + + TestComponentResource(nested.flatMap(_.url)) + } + .unsafeRunSync()(using ctx) + + comp match + case None => fail("Expected component to be defined") + case Some(compRes) => + compRes.urn.getValue(using ctx).unsafeRunSync() match + case Some(urn) => + assert(urn == componentUrn) + compRes.url.getValue(using ctx).unsafeRunSync() match + case Some(url) => + assert(url == "https://test.com") + case None => fail("Expected component url to be defined") + case None => fail("Expected component urn to be defined") + } + +end ContextPropagationTest diff --git a/core/src/test/scala/besom/internal/ContextTest.scala b/core/src/test/scala/besom/internal/ContextTest.scala index cfc5c3f0..c612b606 100644 --- a/core/src/test/scala/besom/internal/ContextTest.scala +++ b/core/src/test/scala/besom/internal/ContextTest.scala @@ -1,6 +1,5 @@ package besom.internal -import RunResult.{given, *} import besom.types.{Output => _, *} class ContextTest extends munit.FunSuite: @@ -9,8 +8,6 @@ class ContextTest extends munit.FunSuite: case class AnotherTestResource(urn: Output[URN], id: Output[ResourceId], url: Output[String]) extends CustomResource test("resource identity - empty outputs, same class") { - given Context = DummyContext().unsafeRunSync() - val v1 = TestResource(Output.empty(), Output.empty(), Output.empty()) val v2 = TestResource(Output.empty(), Output.empty(), Output.empty()) diff --git a/core/src/test/scala/besom/internal/DecoderTest.scala b/core/src/test/scala/besom/internal/DecoderTest.scala index 54e2de56..51b881ce 100644 --- a/core/src/test/scala/besom/internal/DecoderTest.scala +++ b/core/src/test/scala/besom/internal/DecoderTest.scala @@ -410,7 +410,7 @@ class DecoderTest extends munit.FunSuite: ).asValue val d = summon[Decoder[Output[String]]] - val expected = Output("abc").getData.unsafeRunSync() + val expected = Output.pure("abc").getData.unsafeRunSync() d.decode(v, dummyLabel).verify { case Validated.Invalid(ex) => throw ex.head @@ -444,7 +444,7 @@ class DecoderTest extends munit.FunSuite: runWithBothOutputCodecs { test(s"decode string as output string (keepOutputValues: ${Context().featureSupport.keepOutputValues})") { val d = summon[Decoder[Output[String]]] - val expected = Output("abc").getData.unsafeRunSync() + val expected = Output.pure("abc").getData.unsafeRunSync() d.decode("abc".asValue, dummyLabel).verify { case Validated.Invalid(ex) => throw ex.head case Validated.Valid(OutputData.Known(_, _, value)) => diff --git a/core/src/test/scala/besom/internal/DummyContext.scala b/core/src/test/scala/besom/internal/DummyContext.scala index 08d00b01..c7a28737 100644 --- a/core/src/test/scala/besom/internal/DummyContext.scala +++ b/core/src/test/scala/besom/internal/DummyContext.scala @@ -18,12 +18,11 @@ import pulumirpc.resource.{ SupportsFeatureRequest, SupportsFeatureResponse } +import besom.types.URN //noinspection TypeAnnotation object DummyContext: - val dummyRunInfo = RunInfo(Some("test-organization"), "test-project", "test-stack", true, 4, false, "dummy", "dummy") - val dummyFeatureSupport = FeatureSupport(true, true, true, true, true) - val dummyMonitor = new Monitor: + class DummyMonitor extends Monitor: def call(callRequest: ResourceCallRequest): Result[CallResponse] = Result.fail(Exception("Not implemented")) def invoke(invokeRequest: ResourceInvokeRequest): Result[InvokeResponse] = @@ -38,9 +37,10 @@ object DummyContext: Result.fail(Exception("Not implemented")) def registerStackTransform(request: Callback): Result[Unit] = Result.fail(Exception("Not implemented")) - def close(): Result[Unit] = Result.fail(Exception("Not implemented")) + def close(): Result[Unit] = + Result.fail(Exception("Not implemented")) - val dummyEngine = new Engine: + class DummyEngine extends Engine: def getRootResource(getRootResource: GetRootResourceRequest): Result[GetRootResourceResponse] = Result.fail(Exception("Not implemented")) def setRootResource(setRootResource: SetRootResourceRequest): Result[SetRootResourceResponse] = @@ -50,6 +50,11 @@ object DummyContext: def close(): Result[Unit] = Result.fail(Exception("Not implemented")) + val dummyRunInfo = RunInfo(Some("test-organization"), "test-project", "test-stack", true, 4, false, "dummy", "dummy") + val dummyFeatureSupport = FeatureSupport(true, true, true, true, true) + val dummyMonitor = new DummyMonitor + val dummyEngine = new DummyEngine + def apply( runInfo: RunInfo = dummyRunInfo, featureSupport: FeatureSupport = dummyFeatureSupport, @@ -57,7 +62,8 @@ object DummyContext: engine: Engine = dummyEngine, configMap: Map[NonEmptyString, String] = Map.empty, configSecretKeys: Set[NonEmptyString] = Set.empty, - resources: Resources | Result[Resources] = Resources() + resources: Resources | Result[Resources] = Resources(), + stackURN: URN = URN.empty ): Result[Context] = for taskTracker <- TaskTracker() @@ -69,7 +75,7 @@ object DummyContext: case r: Result[Resources] => r memo <- Memo() given Context = Context.create(runInfo, featureSupport, config, logger, monitor, engine, taskTracker, resources, memo, stackPromise) - _ <- stackPromise.fulfill(StackResource()(using ComponentBase(Output(besom.types.URN.empty)))) + _ <- stackPromise.fulfill(StackResource()(using ComponentBase(Output.pure(stackURN)))) yield summon[Context] end DummyContext diff --git a/core/src/test/scala/besom/internal/EncoderTest.scala b/core/src/test/scala/besom/internal/EncoderTest.scala index e4c98524..f00b4f05 100644 --- a/core/src/test/scala/besom/internal/EncoderTest.scala +++ b/core/src/test/scala/besom/internal/EncoderTest.scala @@ -103,7 +103,7 @@ class EncoderTest extends munit.FunSuite with ValueAssertions: test(s"encode output null (keepOutputValues: ${Context().featureSupport.keepOutputValues})") { val e = summon[Encoder[Output[Option[String]]]] - val (_, encoded) = e.encode(Output(None)).unsafeRunSync() + val (_, encoded) = e.encode(Output.pure(None)).unsafeRunSync() val expected = if Context().featureSupport.keepOutputValues then Null.asOutputValue(isSecret = false, dependencies = Nil) @@ -225,8 +225,8 @@ class ArgsEncoderTest extends munit.FunSuite with ValueAssertions: val (res, encoded) = ae .encode( TestArgs( - Output("SOME-TEST-PROVIDER"), - Output(PlainCaseClass(data = "werks?", moreData = 123)) + Output.pure("SOME-TEST-PROVIDER"), + Output.pure(PlainCaseClass(data = "werks?", moreData = 123)) ), _ => false ) @@ -264,8 +264,8 @@ class ArgsEncoderTest extends munit.FunSuite with ValueAssertions: val (res, encoded) = ae .encode( TestOptionArgs( - Output(None), - Output(None) + Output.pure(None), + Output.pure(None) ), _ => false ) @@ -384,7 +384,7 @@ object ProviderArgsEncoderTest: skipUpdateUnreachable: Input.Optional[Boolean] = None, suppressDeprecationWarnings: Input.Optional[Boolean] = None, suppressHelmHookWarnings: Input.Optional[Boolean] = None - )(using Context): ProviderArgs = + ): ProviderArgs = new ProviderArgs( cluster = cluster.asOptionOutput(isSecret = false), context = context.asOptionOutput(isSecret = false), @@ -412,9 +412,9 @@ class ProviderArgsEncoderTest extends munit.FunSuite with ValueAssertions: val (res, encoded) = pae .encode( TestProviderArgs( - Output("SOME-TEST-PROVIDER"), - Output(PlainCaseClass(data = "werks?", moreData = 123)), - Output(List(Output("a"), Output("b"), Output("c"))) + Output.pure("SOME-TEST-PROVIDER"), + Output.pure(PlainCaseClass(data = "werks?", moreData = 123)), + Output.pure(List(Output.pure("a"), Output.pure("b"), Output.pure("c"))) ), _ => false ) @@ -453,9 +453,9 @@ class ProviderArgsEncoderTest extends munit.FunSuite with ValueAssertions: val pae = summon[ProviderArgsEncoder[TestProviderOptionArgs]] val args = TestProviderOptionArgs( - Output(None), - Output(None), - Output(None) + Output.pure(None), + Output.pure(None), + Output.pure(None) ) val (res, encoded) = pae.encode(args, _ => false).unsafeRunSync() @@ -519,7 +519,7 @@ class PropertiesSerializerTest extends munit.FunSuite with ValueAssertions: .serializeResourceProperties( InputOptionalCaseClass( Output.secret(Some("secret1")), - Output(Some(Map("key" -> Output.secret("value1")))) + Output.pure(Some(Map("key" -> Output.secret("value1")))) ) ) .unsafeRunSync() @@ -557,9 +557,9 @@ class PropertiesSerializerTest extends munit.FunSuite with ValueAssertions: val res = PropertiesSerializer .serializeResourceProperties( ExampleResourceArgs( - Output(Some("x")), + Output.pure(Some("x")), Output.secret(Some(true)), - Output(Some(HelperArgs(Output(Some(1))))) + Output.pure(Some(HelperArgs(Output.pure(Some(1))))) ) ) .unsafeRunSync() @@ -717,18 +717,18 @@ class PropertiesSerializerTest extends munit.FunSuite with ValueAssertions: val res = PropertiesSerializer .serializeResourceProperties( FargateServiceTaskDefinitionArgs( - container = Output( + container = Output.pure( Some( TaskDefinitionContainerDefinitionArgs( - portMappings = Output( + portMappings = Output.pure( Some( List( TaskDefinitionPortMappingArgs( - targetGroup = Output( + targetGroup = Output.pure( Some( TargetGroup( urn = URN.parse(testUrn), - id = Output(testId) + id = Output.pure(testId) ) ) ) @@ -739,7 +739,7 @@ class PropertiesSerializerTest extends munit.FunSuite with ValueAssertions: ) ) ), - containers = Output(None) + containers = Output.pure(None) ) ) .unsafeRunSync() @@ -790,13 +790,13 @@ object PropertiesSerializerTest: def apply( privateKeyOpenssh: Input.Optional[String] = scala.None, privateKeyPem: Input.Optional[String] = scala.None - )(using Context): GetPublicKeyArgs = + ): GetPublicKeyArgs = new GetPublicKeyArgs( privateKeyOpenssh = privateKeyOpenssh.asOptionOutput(isSecret = true), privateKeyPem = privateKeyPem.asOptionOutput(isSecret = true) ) - given encoder(using Context): Encoder[GetPublicKeyArgs] = Encoder.derived[GetPublicKeyArgs] - given argsEncoder(using Context): ArgsEncoder[GetPublicKeyArgs] = ArgsEncoder.derived[GetPublicKeyArgs] + given encoder: Encoder[GetPublicKeyArgs] = Encoder.derived[GetPublicKeyArgs] + given argsEncoder: ArgsEncoder[GetPublicKeyArgs] = ArgsEncoder.derived[GetPublicKeyArgs] final case class SecretArgs private ( apiVersion: Output[String], @@ -808,15 +808,15 @@ object PropertiesSerializerTest: def apply( data: Input.Optional[Map[String, besom.types.Input[String]]] = scala.None, metadata: Input.Optional[ObjectMetaArgs] = scala.None - )(using Context): SecretArgs = + ): SecretArgs = new SecretArgs( apiVersion = besom.types.Output("v1"), data = data.asOptionOutput(isSecret = true), kind = besom.types.Output("Secret"), metadata = metadata.asOptionOutput(isSecret = false) ) - given encoder(using Context): Encoder[SecretArgs] = Encoder.derived[SecretArgs] - given argsEncoder(using Context): ArgsEncoder[SecretArgs] = ArgsEncoder.derived[SecretArgs] + given encoder: Encoder[SecretArgs] = Encoder.derived[SecretArgs] + given argsEncoder: ArgsEncoder[SecretArgs] = ArgsEncoder.derived[SecretArgs] final case class ObjectMetaArgs private ( name: Output[Option[String]], @@ -828,32 +828,32 @@ object PropertiesSerializerTest: name: Input.Optional[String] = scala.None, namespace: Input.Optional[String] = scala.None, uid: Input.Optional[String] = scala.None - )(using Context): ObjectMetaArgs = + ): ObjectMetaArgs = new ObjectMetaArgs( name = name.asOptionOutput(isSecret = false), namespace = namespace.asOptionOutput(isSecret = false), uid = uid.asOptionOutput(isSecret = false) ) - given encoder(using Context): Encoder[ObjectMetaArgs] = Encoder.derived[ObjectMetaArgs] - given argsEncoder(using Context): ArgsEncoder[ObjectMetaArgs] = ArgsEncoder.derived[ObjectMetaArgs] + given encoder: Encoder[ObjectMetaArgs] = Encoder.derived[ObjectMetaArgs] + given argsEncoder: ArgsEncoder[ObjectMetaArgs] = ArgsEncoder.derived[ObjectMetaArgs] final case class FargateServiceTaskDefinitionArgs( container: Output[Option[TaskDefinitionContainerDefinitionArgs]], containers: Output[Option[Map[String, TaskDefinitionContainerDefinitionArgs]]] ) object FargateServiceTaskDefinitionArgs: - given encoder(using Context): Encoder[FargateServiceTaskDefinitionArgs] = Encoder.derived[FargateServiceTaskDefinitionArgs] - given argsEncoder(using Context): ArgsEncoder[FargateServiceTaskDefinitionArgs] = ArgsEncoder.derived[FargateServiceTaskDefinitionArgs] + given encoder: Encoder[FargateServiceTaskDefinitionArgs] = Encoder.derived[FargateServiceTaskDefinitionArgs] + given argsEncoder: ArgsEncoder[FargateServiceTaskDefinitionArgs] = ArgsEncoder.derived[FargateServiceTaskDefinitionArgs] final case class TaskDefinitionContainerDefinitionArgs(portMappings: Output[Option[List[TaskDefinitionPortMappingArgs]]]) object TaskDefinitionContainerDefinitionArgs: - given encoder(using Context): Encoder[TaskDefinitionContainerDefinitionArgs] = + given encoder: Encoder[TaskDefinitionContainerDefinitionArgs] = Encoder.derived[TaskDefinitionContainerDefinitionArgs] - given argsEncoder(using Context): ArgsEncoder[TaskDefinitionContainerDefinitionArgs] = + given argsEncoder: ArgsEncoder[TaskDefinitionContainerDefinitionArgs] = ArgsEncoder.derived[TaskDefinitionContainerDefinitionArgs] final case class TaskDefinitionPortMappingArgs(targetGroup: Output[Option[TargetGroup]]) object TaskDefinitionPortMappingArgs: - given encoder(using Context): Encoder[TaskDefinitionPortMappingArgs] = Encoder.derived[TaskDefinitionPortMappingArgs] - given argsEncoder(using Context): ArgsEncoder[TaskDefinitionPortMappingArgs] = ArgsEncoder.derived[TaskDefinitionPortMappingArgs] + given encoder: Encoder[TaskDefinitionPortMappingArgs] = Encoder.derived[TaskDefinitionPortMappingArgs] + given argsEncoder: ArgsEncoder[TaskDefinitionPortMappingArgs] = ArgsEncoder.derived[TaskDefinitionPortMappingArgs] final case class TargetGroup(urn: Output[URN], id: Output[ResourceId]) extends besom.CustomResource end PropertiesSerializerTest @@ -874,16 +874,16 @@ class Regression383Test extends munit.FunSuite with ValueAssertions: object Regression383Test: final case class SecretArgs private (data: Output[Option[Map[String, String]]]) object SecretArgs: - def apply(data: Input.Optional[Map[String, Input[String]]] = None)(using Context): SecretArgs = + def apply(data: Input.Optional[Map[String, Input[String]]] = None): SecretArgs = new SecretArgs(data = data.asOptionOutput(isSecret = true)) - given encoder(using Context): Encoder[SecretArgs] = Encoder.derived[SecretArgs] - given argsEncoder(using Context): ArgsEncoder[SecretArgs] = ArgsEncoder.derived[SecretArgs] + given encoder: Encoder[SecretArgs] = Encoder.derived[SecretArgs] + given argsEncoder: ArgsEncoder[SecretArgs] = ArgsEncoder.derived[SecretArgs] end Regression383Test class RecurrentArgsTest extends munit.FunSuite with ValueAssertions: case class Recurrent(value: Option[Recurrent]) object Recurrent: - given encoder(using Context): Encoder[Recurrent] = Encoder.derived[Recurrent] + given encoder: Encoder[Recurrent] = Encoder.derived[Recurrent] runWithBothOutputCodecs { test(s"encode recurrent type (keepOutputValues: ${Context().featureSupport.keepOutputValues})") { diff --git a/core/src/test/scala/besom/internal/ExportsTest.scala b/core/src/test/scala/besom/internal/ExportsTest.scala index f6b7b9ff..3e2feae5 100644 --- a/core/src/test/scala/besom/internal/ExportsTest.scala +++ b/core/src/test/scala/besom/internal/ExportsTest.scala @@ -10,7 +10,7 @@ class ExportsTest extends munit.FunSuite with ValueAssertions: runWithBothOutputCodecs { test(s"exports alone work as intended (keepOutputValues: ${Context().featureSupport.keepOutputValues})") { - val stackOutputs = Stack.exports(foo = Output("bar")).getExports.result.unsafeRunSync() + val stackOutputs = Stack.exports(foo = Output.pure("bar")).getExports.result.unsafeRunSync() val encoded = Value(Kind.StructValue(stackOutputs)) @@ -34,9 +34,9 @@ class ExportsTest extends munit.FunSuite with ValueAssertions: val atomicBoolean = new java.util.concurrent.atomic.AtomicBoolean(false) val stackDeps = Stack( - Output("foo"), - Output("bar"), - Output(Result.defer { atomicBoolean.set(true); "baz" }) + Output.pure("foo"), + Output.pure("bar"), + Output.ofResult(Result.defer { atomicBoolean.set(true); "baz" }) ).getDependsOn assertEquals(stackDeps.size, 3) @@ -58,11 +58,11 @@ class ExportsTest extends munit.FunSuite with ValueAssertions: test(s"exports with dependencies work as intended (keepOutputValues: ${Context().featureSupport.keepOutputValues})") { val stack = Stack( - Output("foo"), - Output("bar") + Output.pure("foo"), + Output.pure("bar") ).exports( - baz = Output("baz"), - qux = Output(Result.defer { + baz = Output.pure("baz"), + qux = Output.ofResult(Result.defer { "qux" }) ) @@ -108,11 +108,11 @@ class ExportsTest extends munit.FunSuite with ValueAssertions: val stack = Stack .exports( - foo = Output("foo"), + foo = Output.pure("foo"), bar = Output.secret("bar") ) .exports( - baz = Output("baz"), + baz = Output.pure("baz"), qux = Output.secret("qux") ) diff --git a/core/src/test/scala/besom/internal/InterpolatorTest.scala b/core/src/test/scala/besom/internal/InterpolatorTest.scala index a96b1035..f922ee3b 100644 --- a/core/src/test/scala/besom/internal/InterpolatorTest.scala +++ b/core/src/test/scala/besom/internal/InterpolatorTest.scala @@ -5,86 +5,86 @@ import RunResult.{given, *} class InterpolatorTest extends munit.FunSuite { test("interpolator works for a simple dummy case") { - given Context = DummyContext().unsafeRunSync() - val output = Output("Holmes") val interpolated = pulumi"Sherlock $output" + given Context = DummyContext().unsafeRunSync() + assertEquals(interpolated.getData.unsafeRunSync(), OutputData("Sherlock Holmes")) Context().waitForAllTasks.unsafeRunSync() } test("interpolator works for a longer dummy case") { - given Context = DummyContext().unsafeRunSync() - val output = Output("Holmes") val output1 = Output("is") val output2 = Output("!") val interpolated = pulumi"Sherlock $output $output1 a detective${output2}" + given Context = DummyContext().unsafeRunSync() + assertEquals(interpolated.getData.unsafeRunSync(), OutputData("Sherlock Holmes is a detective!")) Context().waitForAllTasks.unsafeRunSync() } test("interpolator works for a simple case with non-output arguments") { - given Context = DummyContext().unsafeRunSync() - val output = "Holmes" val interpolated = pulumi"Sherlock $output and Watson" + given Context = DummyContext().unsafeRunSync() + assertEquals(interpolated.getData.unsafeRunSync(), OutputData("Sherlock Holmes and Watson")) Context().waitForAllTasks.unsafeRunSync() } test("interpolator works for a longer case with non-output arguments") { - given Context = DummyContext().unsafeRunSync() - val output = "Holmes" val output1 = "is" val output2 = "!" val interpolated = pulumi"Sherlock $output $output1 a detective${output2}" + given Context = DummyContext().unsafeRunSync() + assertEquals(interpolated.getData.unsafeRunSync(), OutputData("Sherlock Holmes is a detective!")) Context().waitForAllTasks.unsafeRunSync() } test("interpolator works for a simple case with non-output arguments and output arguments") { - given Context = DummyContext().unsafeRunSync() - val output = Output("Holmes") val output1 = "Watson" val interpolated = pulumi"Sherlock $output and $output1" + given Context = DummyContext().unsafeRunSync() + assertEquals(interpolated.getData.unsafeRunSync(), OutputData("Sherlock Holmes and Watson")) Context().waitForAllTasks.unsafeRunSync() } test("interpolator works for a simple case with mixed non-output arguments and output arguments") { - given Context = DummyContext().unsafeRunSync() - val output = Output("1") val output1 = "2" val output2 = 3 val interpolated = pulumi"$output + $output1 = $output2" + given Context = DummyContext().unsafeRunSync() + assertEquals(interpolated.getData.unsafeRunSync(), OutputData("1 + 2 = 3")) Context().waitForAllTasks.unsafeRunSync() } test("interpolator works for a simple case with mixed non-output arguments and output arguments and nested interpolators") { - given Context = DummyContext().unsafeRunSync() - val output = Output("1") val output1 = "2" val output2 = 3 val interpolated = pulumi"$output + $output1 = ${pulumi"$output2"}" + given Context = DummyContext().unsafeRunSync() + assertEquals(interpolated.getData.unsafeRunSync(), OutputData("1 + 2 = 3")) Context().waitForAllTasks.unsafeRunSync() diff --git a/core/src/test/scala/besom/internal/LoggingTest.scala b/core/src/test/scala/besom/internal/LoggingTest.scala index 0745da5b..99b826aa 100644 --- a/core/src/test/scala/besom/internal/LoggingTest.scala +++ b/core/src/test/scala/besom/internal/LoggingTest.scala @@ -3,7 +3,7 @@ package besom.internal import RunResult.{*, given} import scala.collection.mutable -import besom.types.* +import besom.types.{ResourceId, URN} import java.time.LocalDateTime @@ -22,9 +22,11 @@ class LoggingTest extends munit.FunSuite: test("plain logging works") { val urn = URN("urn:pulumi:stack::project::custom:resources:Resource$besom:testing/test:Resource::my-test-resource") val logger = BesomLogger.local().unsafeRunSync() - val res = TestResource(Output(urn), Output("bar"), Output("url")) + val res = TestResource(Output.pure(urn), Output.pure("bar"), Output.pure("url")) val messages = mutable.ArrayBuffer.empty[LogRecord] + given logging.BesomMDC[_] = logging.BesomMDC.empty + scribe.Logger.root .clearHandlers() .clearModifiers() diff --git a/core/src/test/scala/besom/internal/OutputDataTest.scala b/core/src/test/scala/besom/internal/OutputDataTest.scala index ce0cfb56..e53f9793 100644 --- a/core/src/test/scala/besom/internal/OutputDataTest.scala +++ b/core/src/test/scala/besom/internal/OutputDataTest.scala @@ -1,7 +1,6 @@ package besom.internal -import besom.types.* -import RunResult.{given, *} +import besom.types.URN class OutputDataTest extends munit.FunSuite: @@ -26,11 +25,10 @@ class OutputDataTest extends munit.FunSuite: } test("unknown values propagate dependent resources") { - given Context = DummyContext().unsafeRunSync() val urn = URN( "urn:pulumi:stack::project::custom:resources:Resource$besom:testing/test:Resource::my-test-resource" ) - val res = DependencyResource(Output(urn)) + val res = DependencyResource(Output.pure(urn)) val data = OutputData.unknown(false, resources = Set(res)) val derivative = data.map(_ => ()).flatMap(_ => OutputData(())) @@ -45,11 +43,10 @@ class OutputDataTest extends munit.FunSuite: } test("known values propagate dependent resources") { - given Context = DummyContext().unsafeRunSync() val urn = URN( "urn:pulumi:stack::project::custom:resources:Resource$besom:testing/test:Resource::my-test-resource" ) - val res = DependencyResource(Output(urn)) + val res = DependencyResource(Output.pure(urn)) val data = OutputData("foo", resources = Set(res)) val derivative = data.map(_ => ()).flatMap(_ => OutputData(())) @@ -57,12 +54,11 @@ class OutputDataTest extends munit.FunSuite: } test("zip operator propagates properties and dependencies") { - given Context = DummyContext().unsafeRunSync() val urn = URN( "urn:pulumi:stack::project::custom:resources:Resource$besom:testing/test:Resource::my-test-resource" ) - val res1 = DependencyResource(Output(urn)) - val res2 = DependencyResource(Output(urn)) + val res1 = DependencyResource(Output.pure(urn)) + val res2 = DependencyResource(Output.pure(urn)) val data1 = OutputData("foo", resources = Set(res1), isSecret = true) val data2 = OutputData("bar", resources = Set(res2)) val derivative = data1.zip(data2) @@ -72,11 +68,10 @@ class OutputDataTest extends munit.FunSuite: } test("map operator propagates properties and dependencies") { - given Context = DummyContext().unsafeRunSync() val urn = URN( "urn:pulumi:stack::project::custom:resources:Resource$besom:testing/test:Resource::my-test-resource" ) - val res1 = DependencyResource(Output(urn)) + val res1 = DependencyResource(Output.pure(urn)) val data = OutputData("foo", resources = Set(res1), isSecret = true) val derivative = data.map(_ => "bar") @@ -85,12 +80,11 @@ class OutputDataTest extends munit.FunSuite: } test("flatMap operator propagates properties and dependencies") { - given Context = DummyContext().unsafeRunSync() val urn = URN( "urn:pulumi:stack::project::custom:resources:Resource$besom:testing/test:Resource::my-test-resource" ) - val res1 = DependencyResource(Output(urn)) - val res2 = DependencyResource(Output(urn)) + val res1 = DependencyResource(Output.pure(urn)) + val res2 = DependencyResource(Output.pure(urn)) val data = OutputData("foo", resources = Set(res1), isSecret = true) val derivative = data.flatMap(_ => OutputData("bar", resources = Set(res2))) diff --git a/core/src/test/scala/besom/internal/OutputTest.scala b/core/src/test/scala/besom/internal/OutputTest.scala index 8129ecbc..35f4241a 100644 --- a/core/src/test/scala/besom/internal/OutputTest.scala +++ b/core/src/test/scala/besom/internal/OutputTest.scala @@ -39,7 +39,7 @@ class OutputTest extends munit.FunSuite: given Context = DummyContext().unsafeRunSync() assertEquals(takesNEString("string").getData.unsafeRunSync(), OutputData(Option("string"))) - assertEquals(takesNEString(Output("string")).getData.unsafeRunSync(), OutputData(Option("string"))) + assertEquals(takesNEString(Output.pure("string")).getData.unsafeRunSync(), OutputData(Option("string"))) assertEquals(takesNEString(None).getData.unsafeRunSync(), OutputData(None)) Context().waitForAllTasks.unsafeRunSync() @@ -51,9 +51,9 @@ class OutputTest extends munit.FunSuite: assertEquals(takesManyStrings("value").getData.unsafeRunSync(), OutputData(List("value"))) assertEquals(takesManyStrings(List("value")).getData.unsafeRunSync(), OutputData(List("value"))) assertEquals(takesManyStrings(List("value")).getData.unsafeRunSync(), OutputData(List("value"))) - assertEquals(takesManyStrings(List(Output("value"))).getData.unsafeRunSync(), OutputData(List("value"))) - assertEquals(takesManyStrings(Output(List("value"))).getData.unsafeRunSync(), OutputData(List("value"))) - assertEquals(takesManyStrings(Output(List(Output("value")))).getData.unsafeRunSync(), OutputData(List("value"))) + assertEquals(takesManyStrings(List(Output.pure("value"))).getData.unsafeRunSync(), OutputData(List("value"))) + assertEquals(takesManyStrings(Output.pure(List("value"))).getData.unsafeRunSync(), OutputData(List("value"))) + assertEquals(takesManyStrings(Output.pure(List(Output.pure("value")))).getData.unsafeRunSync(), OutputData(List("value"))) Context().waitForAllTasks.unsafeRunSync() } @@ -62,18 +62,21 @@ class OutputTest extends munit.FunSuite: given Context = DummyContext().unsafeRunSync() assertEquals(takesAList(List("value")).getData.unsafeRunSync(), OutputData(List("value"))) - assertEquals(takesAList(List(Output("value"))).getData.unsafeRunSync(), OutputData(List("value"))) - assertEquals(takesAList(Output(List("value"))).getData.unsafeRunSync(), OutputData(List("value"))) - assertEquals(takesAList(Output(List(Output("value")))).getData.unsafeRunSync(), OutputData(List("value"))) + assertEquals(takesAList(List(Output.pure("value"))).getData.unsafeRunSync(), OutputData(List("value"))) + assertEquals(takesAList(Output.pure(List("value"))).getData.unsafeRunSync(), OutputData(List("value"))) + assertEquals(takesAList(Output.pure(List(Output.pure("value")))).getData.unsafeRunSync(), OutputData(List("value"))) assertEquals(takesAnOptionalList(List("value")).getData.unsafeRunSync(), OutputData(Option(List("value")))) - assertEquals(takesAnOptionalList(List(Output("value"))).getData.unsafeRunSync(), OutputData(Option(List("value")))) - assertEquals(takesAnOptionalList(Output(List("value"))).getData.unsafeRunSync(), OutputData(Option(List("value")))) - assertEquals(takesAnOptionalList(Output(List(Output("value")))).getData.unsafeRunSync(), OutputData(Option(List("value")))) + assertEquals(takesAnOptionalList(List(Output.pure("value"))).getData.unsafeRunSync(), OutputData(Option(List("value")))) + assertEquals(takesAnOptionalList(Output.pure(List("value"))).getData.unsafeRunSync(), OutputData(Option(List("value")))) + assertEquals(takesAnOptionalList(Output.pure(List(Output.pure("value")))).getData.unsafeRunSync(), OutputData(Option(List("value")))) assertEquals(takesAnOptionalList(Option(List("value"))).getData.unsafeRunSync(), OutputData(Option(List("value")))) - assertEquals(takesAnOptionalList(Option(List(Output("value")))).getData.unsafeRunSync(), OutputData(Option(List("value")))) - assertEquals(takesAnOptionalList(Output(Option(List("value")))).getData.unsafeRunSync(), OutputData(Option(List("value")))) - assertEquals(takesAnOptionalList(Output(Option(List(Output("value"))))).getData.unsafeRunSync(), OutputData(Option(List("value")))) + assertEquals(takesAnOptionalList(Option(List(Output.pure("value")))).getData.unsafeRunSync(), OutputData(Option(List("value")))) + assertEquals(takesAnOptionalList(Output.pure(Option(List("value")))).getData.unsafeRunSync(), OutputData(Option(List("value")))) + assertEquals( + takesAnOptionalList(Output.pure(Option(List(Output.pure("value"))))).getData.unsafeRunSync(), + OutputData(Option(List("value"))) + ) Context().waitForAllTasks.unsafeRunSync() } @@ -82,28 +85,28 @@ class OutputTest extends munit.FunSuite: given Context = DummyContext().unsafeRunSync() assertEquals(takesAMap(Map("key" -> "value")).getData.unsafeRunSync(), OutputData(Map("key" -> "value"))) - assertEquals(takesAMap(Map("key" -> Output("value"))).getData.unsafeRunSync(), OutputData(Map("key" -> "value"))) - assertEquals(takesAMap(Output(Map("key" -> "value"))).getData.unsafeRunSync(), OutputData(Map("key" -> "value"))) - assertEquals(takesAMap(Output(Map("key" -> Output("value")))).getData.unsafeRunSync(), OutputData(Map("key" -> "value"))) + assertEquals(takesAMap(Map("key" -> Output.pure("value"))).getData.unsafeRunSync(), OutputData(Map("key" -> "value"))) + assertEquals(takesAMap(Output.pure(Map("key" -> "value"))).getData.unsafeRunSync(), OutputData(Map("key" -> "value"))) + assertEquals(takesAMap(Output.pure(Map("key" -> Output.pure("value")))).getData.unsafeRunSync(), OutputData(Map("key" -> "value"))) assertEquals(takesAnOptionalMap(Map("key" -> "value")).getData.unsafeRunSync(), OutputData(Option(Map("key" -> "value")))) - assertEquals(takesAnOptionalMap(Map("key" -> Output("value"))).getData.unsafeRunSync(), OutputData(Option(Map("key" -> "value")))) - assertEquals(takesAnOptionalMap(Output(Map("key" -> "value"))).getData.unsafeRunSync(), OutputData(Option(Map("key" -> "value")))) + assertEquals(takesAnOptionalMap(Map("key" -> Output.pure("value"))).getData.unsafeRunSync(), OutputData(Option(Map("key" -> "value")))) + assertEquals(takesAnOptionalMap(Output.pure(Map("key" -> "value"))).getData.unsafeRunSync(), OutputData(Option(Map("key" -> "value")))) assertEquals( - takesAnOptionalMap(Output(Map("key" -> Output("value")))).getData.unsafeRunSync(), + takesAnOptionalMap(Output.pure(Map("key" -> Output.pure("value")))).getData.unsafeRunSync(), OutputData(Option(Map("key" -> "value"))) ) assertEquals(takesAnOptionalMap(Option(Map("key" -> "value"))).getData.unsafeRunSync(), OutputData(Option(Map("key" -> "value")))) assertEquals( - takesAnOptionalMap(Option(Map("key" -> Output("value")))).getData.unsafeRunSync(), + takesAnOptionalMap(Option(Map("key" -> Output.pure("value")))).getData.unsafeRunSync(), OutputData(Option(Map("key" -> "value"))) ) assertEquals( - takesAnOptionalMap(Output(Option(Map("key" -> "value")))).getData.unsafeRunSync(), + takesAnOptionalMap(Output.pure(Option(Map("key" -> "value")))).getData.unsafeRunSync(), OutputData(Option(Map("key" -> "value"))) ) assertEquals( - takesAnOptionalMap(Output(Option(Map("key" -> Output("value"))))).getData.unsafeRunSync(), + takesAnOptionalMap(Output.pure(Option(Map("key" -> Output.pure("value"))))).getData.unsafeRunSync(), OutputData(Option(Map("key" -> "value"))) ) @@ -113,7 +116,7 @@ class OutputTest extends munit.FunSuite: test("multiple evaluations of sequence") { given Context = DummyContext().unsafeRunSync() - val seq = Output.sequence(List(Output("value"), Output("value2"))) + val seq = Output.sequence(List(Output.pure("value"), Output.pure("value2"))) val firstEval = seq.getData.unsafeRunSync() assertEquals(firstEval, OutputData(List("value", "value2"))) @@ -127,7 +130,7 @@ class OutputTest extends munit.FunSuite: test("multiple evaluations of parSequence") { given Context = DummyContext().unsafeRunSync() - val seq = Output.parSequence(List(Output("value"), Output("value2"))) + val seq = Output.parSequence(List(Output.pure("value"), Output.pure("value2"))) val firstEval = seq.getData.unsafeRunSync() assertEquals(firstEval, OutputData(List("value", "value2"))) @@ -143,10 +146,10 @@ class OutputTest extends munit.FunSuite: given Context = DummyContext().unsafeRunSync() def sleepAndReturn[A](value: A): Output[A] = - Output.apply(Result.sleep(50).map(_ => value)) + Output.ofResult(Result.sleep(50).map(_ => value)) def timeOutput(output: Output[?]): Output[Long] = - Output(Result.defer(System.currentTimeMillis())).zip(output).map { case (start, _) => System.currentTimeMillis() - start } + Output.ofResult(Result.defer(System.currentTimeMillis())).zip(output).map { case (start, _) => System.currentTimeMillis() - start } val time = timeOutput(Output.parSequence(List(sleepAndReturn("value"), sleepAndReturn("value2"), sleepAndReturn("value3")))) @@ -160,7 +163,7 @@ class OutputTest extends munit.FunSuite: given Context = DummyContext().unsafeRunSync() import besom.aliases.OutputExtensions.* - val out: Output[List[String]] = List("value", "value2").traverse(Output(_)) + val out: Output[List[String]] = List("value", "value2").traverse(Output.pure(_)) val firstEval = out.getData.unsafeRunSync() assertEquals(firstEval, OutputData(List("value", "value2"))) @@ -174,15 +177,24 @@ class OutputTest extends munit.FunSuite: test("Output.sequence works with all kinds of collections") { given Context = DummyContext().unsafeRunSync() - assertEquals(Output.sequence(List(Output("value"), Output("value2"))).getData.unsafeRunSync(), OutputData(List("value", "value2"))) - assertEquals(Output.sequence(Vector(Output("value"), Output("value2"))).getData.unsafeRunSync(), OutputData(Vector("value", "value2"))) - assertEquals(Output.sequence(Set(Output("value"), Output("value2"))).getData.unsafeRunSync(), OutputData(Set("value", "value2"))) assertEquals( - Output.sequence(Array(Output("value"), Output("value2")).toList).getData.unsafeRunSync(), + Output.sequence(List(Output.pure("value"), Output.pure("value2"))).getData.unsafeRunSync(), + OutputData(List("value", "value2")) + ) + assertEquals( + Output.sequence(Vector(Output.pure("value"), Output.pure("value2"))).getData.unsafeRunSync(), + OutputData(Vector("value", "value2")) + ) + assertEquals( + Output.sequence(Set(Output.pure("value"), Output.pure("value2"))).getData.unsafeRunSync(), + OutputData(Set("value", "value2")) + ) + assertEquals( + Output.sequence(Array(Output.pure("value"), Output.pure("value2")).toList).getData.unsafeRunSync(), OutputData(List("value", "value2")) ) val iter: Iterable[String] = List("value", "value2") - assertEquals(Output.sequence(iter.map(Output(_))).getData.unsafeRunSync(), OutputData(List("value", "value2"))) + assertEquals(Output.sequence(iter.map(Output.pure(_))).getData.unsafeRunSync(), OutputData(List("value", "value2"))) Context().waitForAllTasks.unsafeRunSync() } @@ -192,7 +204,10 @@ class OutputTest extends munit.FunSuite: given Context = DummyContext().unsafeRunSync() assertEquals(List(Output("value"), Output("value2")).sequence.getData.unsafeRunSync(), OutputData(List("value", "value2"))) - assertEquals(Vector(Output("value"), Output("value2")).sequence.getData.unsafeRunSync(), OutputData(Vector("value", "value2"))) + assertEquals( + Vector(Output("value"), Output("value2")).sequence.getData.unsafeRunSync(), + OutputData(Vector("value", "value2")) + ) assertEquals(Set(Output("value"), Output("value2")).sequence.getData.unsafeRunSync(), OutputData(Set("value", "value2"))) assertEquals( Array("value", "value2").toList.traverse(x => Output(x)).getData.unsafeRunSync(), @@ -234,7 +249,7 @@ class OutputTest extends munit.FunSuite: import besom.internal.RunOutput.{*, given} given besom.internal.Context = DummyContext().unsafeRunSync() - val out: Output[Int] = Output(1).flatMap(x => Output(x + 1))""" + val out: Output[Int] = Output.pure(1).flatMap(x => Output.pure(x + 1))""" ) assert(shouldCompile.isEmpty) @@ -245,7 +260,7 @@ class OutputTest extends munit.FunSuite: import besom.internal.RunOutput.{*, given} given besom.internal.Context = DummyContext().unsafeRunSync() - val out: Output[Int] = Output(1).flatMap(x => Option(x + 1))""" + val out: Output[Int] = Output.pure(1).flatMap(x => Option(x + 1))""" ) assert(shouldNotCompile.size == 1) @@ -265,7 +280,7 @@ class OutputTest extends munit.FunSuite: import besom.internal.RunOutput.{*, given} given besom.internal.Context = DummyContext().unsafeRunSync() - val out: Output[Int] = Output(1).flatMap(_ => 1)""" + val out: Output[Int] = Output.pure(1).flatMap(_ => 1)""" ) assert(shouldNotCompileFlatMapRawValue.size == 1) @@ -287,10 +302,10 @@ class OutputTest extends munit.FunSuite: optVal <- Vector(true, false) outVal <- Vector(true, false) do - val c = if outCond then Output(cond) else cond + val c = if outCond then Output.pure(cond) else cond val v = (outVal, optVal) match - case (true, true) => Output(Option(value)) - case (true, false) => Output(value) + case (true, true) => Output.pure(Option(value)) + case (true, false) => Output.pure(value) case (false, true) => Some(value) case (false, false) => value @@ -306,7 +321,7 @@ class OutputTest extends munit.FunSuite: import besom.OutputOptionOps given Context = DummyContext().unsafeRunSync() - val result = Output(Some("value")).getOrFail(Exception("error")) + val result = Output.pure(Some("value")).getOrFail(Exception("error")) assertEquals(result.getData.unsafeRunSync(), OutputData("value")) } @@ -314,7 +329,7 @@ class OutputTest extends munit.FunSuite: import besom.OutputOptionOps given Context = DummyContext().unsafeRunSync() - val result = Output(None).getOrFail(Exception("error")) + val result = Output.pure(None).getOrFail(Exception("error")) interceptMessage[Exception]("error")(result.getData.unsafeRunSync()) } @@ -328,11 +343,11 @@ class OutputTest extends munit.FunSuite: for outVal <- Vector(true, false) do val d = outVal match - case true => Output(default) + case true => Output.pure(default) case false => default test(s"Option.getOrElse ${value} or ${default} (outVal: ${outVal})") { - val result = Output(value).getOrElse(d) + val result = Output.pure(value).getOrElse(d) assertEquals(result.getData.unsafeRunSync(), OutputData(expected)) } } @@ -349,11 +364,11 @@ class OutputTest extends munit.FunSuite: for outVal <- Vector(true, false) do val d = outVal match - case true => Output(default) + case true => Output.pure(default) case false => default test(s"Option.orElse ${value} orElse ${default} (outVal: ${outVal})") { - val result = Output(value).orElse(d) + val result = Output.pure(value).orElse(d) assertEquals(result.getData.unsafeRunSync(), OutputData(expected)) } } @@ -369,8 +384,8 @@ class OutputTest extends munit.FunSuite: do test(s"Option.mapInner ${value} (outVal: ${outVal})") { val result: Output[Option[String]] = // FIXME: the inference is not working without the explicit type - if outVal then Output(value).mapInner(f.andThen(Output(_))) - else Output(value).mapInner(f) + if outVal then Output.pure(value).mapInner(f.andThen(Output.pure(_))) + else Output.pure(value).mapInner(f) assertEquals(result.getData.unsafeRunSync(), OutputData(expected)) } } @@ -386,8 +401,8 @@ class OutputTest extends munit.FunSuite: do test(s"Option.flatMapInner ${value} (outVal: ${outVal})") { val result = - if outVal then Output(value).flatMapInner(f.andThen(Output(_))) - else Output(value).flatMapInner(f) + if outVal then Output.pure(value).flatMapInner(f.andThen(Output.pure(_))) + else Output.pure(value).flatMapInner(f) assertEquals(result.getData.unsafeRunSync(), OutputData(expected)) } } @@ -401,7 +416,7 @@ class OutputTest extends munit.FunSuite: given Context = DummyContext().unsafeRunSync() test(s"List.headOption ${value}") { - val result = Output(value).headOption + val result = Output.pure(value).headOption assertEquals(result.getData.unsafeRunSync(), OutputData(expected)) } } @@ -415,7 +430,7 @@ class OutputTest extends munit.FunSuite: given Context = DummyContext().unsafeRunSync() test(s"List.lastOption ${value}") { - val result = Output(value).lastOption + val result = Output.pure(value).lastOption assertEquals(result.getData.unsafeRunSync(), OutputData(expected)) } } @@ -430,7 +445,7 @@ class OutputTest extends munit.FunSuite: given Context = DummyContext().unsafeRunSync() test(s"List.tailOrEmpty ${value}") { - val result = Output(value).tailOrEmpty + val result = Output.pure(value).tailOrEmpty assertEquals(result.getData.unsafeRunSync(), OutputData(expected)) } } @@ -445,7 +460,7 @@ class OutputTest extends munit.FunSuite: given Context = DummyContext().unsafeRunSync() test(s"List.initOrEmpty ${value}") { - val result = Output(value).initOrEmpty + val result = Output.pure(value).initOrEmpty assertEquals(result.getData.unsafeRunSync(), OutputData(expected)) } } @@ -462,8 +477,8 @@ class OutputTest extends munit.FunSuite: do test(s"List.mapInner ${value}") { val result = - if outVal then Output(value).mapInner(f.andThen(Output(_))) - else Output(value).mapInner(f) + if outVal then Output.pure(value).mapInner(f.andThen(Output.pure(_))) + else Output.pure(value).mapInner(f) assertEquals(result.getData.unsafeRunSync(), OutputData(expected)) } } @@ -484,8 +499,8 @@ class OutputTest extends munit.FunSuite: do test(s"List.flatMapInner ${value}") { val result = - if outVal then Output(value).flatMapInner(f.andThen(Output(_))) - else Output(value).flatMapInner(f) + if outVal then Output.pure(value).flatMapInner(f.andThen(Output.pure(_))) + else Output.pure(value).flatMapInner(f) assertEquals(result.getData.unsafeRunSync(), OutputData(expected)) } } @@ -500,7 +515,7 @@ class OutputTest extends munit.FunSuite: given Context = DummyContext().unsafeRunSync() test(s"Option[List].headOption ${value}") { - val result = Output(value).headOption + val result = Output.pure(value).headOption assertEquals(result.getData.unsafeRunSync(), OutputData(expected)) } } @@ -515,7 +530,7 @@ class OutputTest extends munit.FunSuite: given Context = DummyContext().unsafeRunSync() test(s"Option[List].lastOption ${value}") { - val result = Output(value).lastOption + val result = Output.pure(value).lastOption assertEquals(result.getData.unsafeRunSync(), OutputData(expected)) } } @@ -531,7 +546,7 @@ class OutputTest extends munit.FunSuite: given Context = DummyContext().unsafeRunSync() test(s"Option[List].tailOrEmpty ${value}") { - val result = Output(value).tailOrEmpty + val result = Output.pure(value).tailOrEmpty assertEquals(result.getData.unsafeRunSync(), OutputData(expected)) } } @@ -547,7 +562,7 @@ class OutputTest extends munit.FunSuite: given Context = DummyContext().unsafeRunSync() test(s"Option[List].initOrEmpty ${value}") { - val result = Output(value).initOrEmpty + val result = Output.pure(value).initOrEmpty assertEquals(result.getData.unsafeRunSync(), OutputData(expected)) } } @@ -577,8 +592,8 @@ class OutputTest extends munit.FunSuite: do test(s"Option[List].mapInner ${value}") { val result = - if outVal then Output(value).mapInner(f.andThen(Output(_))) - else Output(value).mapInner(f) + if outVal then Output.pure(value).mapInner(f.andThen(Output.pure(_))) + else Output.pure(value).mapInner(f) assertEquals(result.getData.unsafeRunSync(), OutputData(expected)) } } @@ -608,8 +623,8 @@ class OutputTest extends munit.FunSuite: do test(s"Option[List].flatMapInner ${value}") { val result = - if outVal then Output(value).flatMapInner(f.andThen(Output(_))) - else Output(value).flatMapInner(f) + if outVal then Output.pure(value).flatMapInner(f.andThen(Output.pure(_))) + else Output.pure(value).flatMapInner(f) assertEquals(result.getData.unsafeRunSync(), OutputData(expected)) } } @@ -620,7 +635,7 @@ class OutputTest extends munit.FunSuite: given Context = DummyContext().unsafeRunSync() - val o3 = Output(("string", 23, true)) + val o3 = Output.pure(("string", 23, true)) val (str, int, bool) = o3.unzip @@ -631,7 +646,7 @@ class OutputTest extends munit.FunSuite: // explicitly tuple of 20 elements val tupleOf22Elems = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22) - val o22 = Output(tupleOf22Elems) + val o22 = Output.pure(tupleOf22Elems) val tupleOf22Outputs = o22.unzip @@ -640,7 +655,7 @@ class OutputTest extends munit.FunSuite: // explicitly tuple of 23 elements, testing tuple xxl val tupleOf23Elems = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, "23") - val o23 = Output(tupleOf23Elems) + val o23 = Output.pure(tupleOf23Elems) val tupleOf23Outputs = o23.unzip @@ -670,7 +685,7 @@ class OutputTest extends munit.FunSuite: val failedOutput: Output[Int] = Output.fail(Exception("error")) val recoveredOutput = failedOutput.recoverWith { case _: Exception => - Output(42) + Output.pure(42) } assertEquals(recoveredOutput.getData.unsafeRunSync(), OutputData(42)) @@ -731,16 +746,17 @@ class OutputTest extends munit.FunSuite: var tappedValue = 0 var tappedError: Throwable = new RuntimeException("everything is fine") - val output = Output(42).tapBoth( - value => { - tappedValue = value - Output.unit - }, - error => { - tappedError = error - Output.unit - } - ) + val output = Output(42) + .tapBoth( + value => { + tappedValue = value + Output.unit + }, + error => { + tappedError = error + Output.unit + } + ) assertEquals(output.getData.unsafeRunSync(), OutputData(42)) assertEquals(tappedValue, 42) diff --git a/core/src/test/scala/besom/internal/OutputValueTest.scala b/core/src/test/scala/besom/internal/OutputValueTest.scala index 44d2bc25..d5d921be 100644 --- a/core/src/test/scala/besom/internal/OutputValueTest.scala +++ b/core/src/test/scala/besom/internal/OutputValueTest.scala @@ -37,7 +37,7 @@ class OutputValueCodecTest extends munit.FunSuite with ValueAssertions: // calculate the expected test values for various stages of the test val maybeValue = Option(value) val urns: List[URN] = deps.map(URN.from(_).get) - val resources: Set[Resource] = urns.map(urn => DependencyResource(Output(urn))).toSet + val resources: Set[Resource] = urns.map(urn => DependencyResource(Output.pure(urn))).toSet val protoValue = value.asValue // we don't know with the unknown value is empty or not so we default to false to not short-circuit the Metadata#combine method val empty = if !isKnown then false else protoValue.kind.isNullValue diff --git a/core/src/test/scala/besom/internal/RegistersOutputsDerivationTest.scala b/core/src/test/scala/besom/internal/RegistersOutputsDerivationTest.scala index 2f74e2c3..4fe2365c 100644 --- a/core/src/test/scala/besom/internal/RegistersOutputsDerivationTest.scala +++ b/core/src/test/scala/besom/internal/RegistersOutputsDerivationTest.scala @@ -1,6 +1,6 @@ package besom.internal -import besom.types.* +import besom.types.URN import RunResult.{given, *} import com.google.protobuf.struct.Struct @@ -9,12 +9,12 @@ class RegistersOutputsDerivationTest extends munit.FunSuite { runWithBothOutputCodecs { test(s"derive an instance for TestRegistersOutputs (keepOutputValues: ${Context().featureSupport.keepOutputValues})") { - given ComponentBase = ComponentBase(Output(URN.empty)) + given ComponentBase = ComponentBase(Output.pure(URN.empty)) val intEncoder = summon[Encoder[Output[Int]]] val instance = summon[RegistersOutputs[TestRegistersOutputs]] - val testRegistersOutputs = TestRegistersOutputs(Output(1)) + val testRegistersOutputs = TestRegistersOutputs(Output.pure(1)) val serializedStruct = instance.serializeOutputs(testRegistersOutputs).unsafeRunSync() val expectedStruct = Struct( Map("a" -> intEncoder.encode(testRegistersOutputs.a).map(_._2).unsafeRunSync()) @@ -30,14 +30,14 @@ class RegistersOutputsDerivationTest extends munit.FunSuite { runWithBothOutputCodecs { test(s"derive an instance for TestRegistersOutputs3 (keepOutputValues: ${Context().featureSupport.keepOutputValues})") { - given ComponentBase = ComponentBase(Output(URN.empty)) + given ComponentBase = ComponentBase(Output.pure(URN.empty)) val intEncoder = summon[Encoder[Output[Int]]] val stringEncoder = summon[Encoder[Output[String]]] val booleanEncoder = summon[Encoder[Output[Boolean]]] val instance = summon[RegistersOutputs[TestRegistersOutputs3]] - val testRegistersOutputs = TestRegistersOutputs3(Output(1), Output("XD"), Output(false)) + val testRegistersOutputs = TestRegistersOutputs3(Output.pure(1), Output.pure("XD"), Output.pure(false)) val serializedStruct = instance.serializeOutputs(testRegistersOutputs).unsafeRunSync() val expectedStruct = Struct( Map( diff --git a/core/src/test/scala/besom/internal/ResourceDecoderTest.scala b/core/src/test/scala/besom/internal/ResourceDecoderTest.scala index bbc21377..23e995b6 100644 --- a/core/src/test/scala/besom/internal/ResourceDecoderTest.scala +++ b/core/src/test/scala/besom/internal/ResourceDecoderTest.scala @@ -3,7 +3,7 @@ package besom.internal import besom.internal.ProtobufUtil.{*, given} import besom.internal.RunResult.{*, given} import besom.internal.logging.* -import besom.types.* +import besom.types.{URN, ResourceId, Label} import besom.util.* import com.google.protobuf.struct.* @@ -24,7 +24,7 @@ class ResourceDecoderTest extends munit.FunSuite: def checkOutput[A]( output: Output[A] - )(expectedValue: A, expectedDependencies: Set[Resource], expectedIsSecret: Boolean): Unit = + )(expectedValue: A, expectedDependencies: Set[Resource], expectedIsSecret: Boolean)(using Context): Unit = (output.getData.unsafeRunSync(): @unchecked) match case OutputData.Known(dependencies, isSecret, Some(value)) => assertEquals(value, expectedValue) @@ -33,7 +33,7 @@ class ResourceDecoderTest extends munit.FunSuite: case obtained => fail(s"Expected OutputData.Known", clues(expectedValue, obtained.getValue)) // noinspection TypeAnnotation - def assertDecodingError[A](output: Output[A]) = + def assertDecodingError[A](output: Output[A])(using Context): Unit = try output.getData.unsafeRunSync() fail(s"Expected failed output, got successful output: ${output.getData.unsafeRunSync()}") @@ -45,7 +45,7 @@ class ResourceDecoderTest extends munit.FunSuite: runWithBothOutputCodecs { test(s"resource resolver - happy path (keepOutputValues: ${Context().featureSupport.keepOutputValues})") { val resourceDecoder = summon[ResourceDecoder[TestResource]] - val dependencyResource = DependencyResource(Output(URN.empty)) + val dependencyResource = DependencyResource(Output.pure(URN.empty)) val errorOrResourceResult = Right( RawResourceResult( @@ -131,7 +131,7 @@ class ResourceDecoderTest extends munit.FunSuite: s"resource resolver - required property received as NullValue, issue #150 (keepOutputValues: ${Context().featureSupport.keepOutputValues})" ) { val resourceDecoder = summon[ResourceDecoder[TestResource]] - val dependencyResource = DependencyResource(Output(URN.empty)) + val dependencyResource = DependencyResource(Output.pure(URN.empty)) val errorOrResourceResult = Right( RawResourceResult( @@ -169,7 +169,7 @@ class ResourceDecoderTest extends munit.FunSuite: final case class PortResponse(port: Int, protocol: Option[String]) object PortResponse: - given decoder(using Context): Decoder[PortResponse] = Decoder.derived[PortResponse] + given decoder: Decoder[PortResponse] = Decoder.derived[PortResponse] final case class IpAddressResponse( autoGeneratedDomainNameLabelScope: String, // FIXME: should be optional @@ -180,7 +180,7 @@ class ResourceDecoderTest extends munit.FunSuite: `type`: String ) object IpAddressResponse: - given decoder(using Context): Decoder[IpAddressResponse] = Decoder.derived[IpAddressResponse] + given decoder: Decoder[IpAddressResponse] = Decoder.derived[IpAddressResponse] final case class ContainerGroup( urn: Output[URN], @@ -188,8 +188,8 @@ class ResourceDecoderTest extends munit.FunSuite: ipAddress: Output[Option[IpAddressResponse]] ) extends CustomResource object ContainerGroup: - given resourceDecoder(using Context): ResourceDecoder[ContainerGroup] = ResourceDecoder.derived[ContainerGroup] - given decoder(using Context): Decoder[ContainerGroup] = Decoder.customResourceDecoder[ContainerGroup] + given resourceDecoder: ResourceDecoder[ContainerGroup] = ResourceDecoder.derived[ContainerGroup] + given decoder: Decoder[ContainerGroup] = Decoder.customResourceDecoder[ContainerGroup] runWithBothOutputCodecs { test(s"partially valid resource") { @@ -290,8 +290,8 @@ class ResourceDecoderTest extends munit.FunSuite: scala_ : Output[String] ) extends CustomResource object Mangled: - given resourceDecoder(using Context): ResourceDecoder[Mangled] = ResourceDecoder.derived - given decoder(using Context): Decoder[Mangled] = Decoder.customResourceDecoder + given resourceDecoder: ResourceDecoder[Mangled] = ResourceDecoder.derived + given decoder: Decoder[Mangled] = Decoder.customResourceDecoder runWithBothOutputCodecs { test(s"mangled fields") { diff --git a/core/src/test/scala/besom/internal/ResourceOpsTest.scala b/core/src/test/scala/besom/internal/ResourceOpsTest.scala index 156cdd81..ce4de662 100644 --- a/core/src/test/scala/besom/internal/ResourceOpsTest.scala +++ b/core/src/test/scala/besom/internal/ResourceOpsTest.scala @@ -1,7 +1,6 @@ package besom.internal -import besom.types.* -// import besom.internal.DummyContext +import besom.types.{Label, ResourceId, URN, ProviderType} import besom.internal.RunResult.given import besom.internal.RunOutput.* import besom.internal.logging.BesomMDC diff --git a/core/src/test/scala/besom/internal/RunOutput.scala b/core/src/test/scala/besom/internal/RunOutput.scala index 372de734..f4bea5a5 100644 --- a/core/src/test/scala/besom/internal/RunOutput.scala +++ b/core/src/test/scala/besom/internal/RunOutput.scala @@ -3,11 +3,11 @@ package besom.internal import scala.concurrent.Future trait RunOutput[F[+_]]: - def run[A](output: Output[A]): Option[A] + def run[A](output: Output[A])(using Context): Option[A] object RunOutput: given runOutputForFuture(using RunResult[Future]): RunOutput[Future] = new RunOutput[Future]: - def run[A](output: Output[A]): Option[A] = RunResult.unsafeRunSync(output.getData)().getValue + def run[A](output: Output[A])(using Context): Option[A] = RunResult.unsafeRunSync(output.getData)().getValue - extension [F[+_], A](output: Output[A])(using ro: RunOutput[F]) def unsafeRunSync(): Option[A] = ro.run(output) - extension [F[+_], A](result: Result[A])(using rr: RunResult[F]) def unsafeRunSync(): A = rr.run(result) + extension [F[+_], A](output: Output[A])(using ro: RunOutput[F]) def unsafeRunSync()(using Context): Option[A] = ro.run(output) + extension [F[+_], A](result: Result[A])(using rr: RunResult[F]) def unsafeRunSync(): A = rr.run(result) diff --git a/core/src/test/scala/besom/internal/RunResult.scala b/core/src/test/scala/besom/internal/RunResult.scala index e2776687..ff6e4b50 100644 --- a/core/src/test/scala/besom/internal/RunResult.scala +++ b/core/src/test/scala/besom/internal/RunResult.scala @@ -8,7 +8,7 @@ trait RunResult[F[+_]]: object RunResult: given RunResult[Future] = new RunResult[Future]: given ExecutionContext = ExecutionContext.fromExecutorService( - null, // FJP does seem to swallow fatals + null, // global Future EC reports fatals and uncaught exceptions to stderr, we want to quit on fatals (t: Throwable) => // TODO this has to contain a link to github issue tracker to allow user to easily create a bug report, this is EXTREMELY IMPORTANT scribe.error("Uncaught fatal error in Future Runtime", t) diff --git a/core/src/test/scala/besom/util/JsonInterpolatorTest.scala b/core/src/test/scala/besom/util/JsonInterpolatorTest.scala index 561be543..ade44ca5 100644 --- a/core/src/test/scala/besom/util/JsonInterpolatorTest.scala +++ b/core/src/test/scala/besom/util/JsonInterpolatorTest.scala @@ -70,7 +70,7 @@ class JsonInterpolatorTest extends FunSuite with CompileAssertions: val str = "\"test" val int = 1 val long = 5L - val float = Output(2.3f) + val float = Output.pure(2.3f) val double = 3.4d val bool = true val jsonOutput = json"""{"a": 1, "b": $str, "c": $int, "d": $long, "e": $float, "f": $double, "g": $bool}""" @@ -106,11 +106,11 @@ class JsonInterpolatorTest extends FunSuite with CompileAssertions: given besom.internal.Context = DummyContext().unsafeRunSync() val str = Option(Some("test")) - val int = Output(Option(1)) - val long = Some(Output(5L)) - val float = Output(Some(2.3f)) - val double = Option(Output(3.4d)) - val bool = Output(Output(true)) + val int = Output.pure(Option(1)) + val long = Some(Output.pure(5L)) + val float = Output.pure(Some(2.3f)) + val double = Option(Output.pure(3.4d)) + val bool = Output.pure(Output.pure(true)) val nullValue = None val anotherNull = Some(None) val literalNull = null: String @@ -152,7 +152,7 @@ class JsonInterpolatorTest extends FunSuite with CompileAssertions: import besom.internal.RunOutput.{*, given} given besom.internal.Context = DummyContext().unsafeRunSync() - def x = Output(java.time.Instant.now()) + def x = Output.pure(java.time.Instant.now()) """ + code.`val json = json"""{"a": 1, "b": $x}"""` ) @@ -194,7 +194,7 @@ class JsonInterpolatorTest extends FunSuite with CompileAssertions: import besom.internal.RunOutput.{*, given} given besom.internal.Context = DummyContext().unsafeRunSync() - val x = Output(Option(java.time.Instant.now())) + val x = Output.pure(Option(java.time.Instant.now())) """ + code.`val json = json"""{"a": 1, "b": $x}"""` ) @@ -215,7 +215,7 @@ class JsonInterpolatorTest extends FunSuite with CompileAssertions: import besom.internal.RunOutput.{*, given} given besom.internal.Context = DummyContext().unsafeRunSync() - val x = Option(Output(java.time.Instant.now())) + val x = Option(Output.pure(java.time.Instant.now())) """ + code.`val json = json"""{"a": 1, "b": $x}"""` ) @@ -236,7 +236,7 @@ class JsonInterpolatorTest extends FunSuite with CompileAssertions: import besom.internal.RunOutput.{*, given} given besom.internal.Context = DummyContext().unsafeRunSync() - val x = Output(Output(java.time.Instant.now())) + val x = Output.pure(Output.pure(java.time.Instant.now())) """ + code.`val json = json"""{"a": 1, "b": $x}"""` ) diff --git a/core/src/test/scala/besom/util/NonEmptyStringTest.scala b/core/src/test/scala/besom/util/NonEmptyStringTest.scala index 3c35e260..1442d72f 100644 --- a/core/src/test/scala/besom/util/NonEmptyStringTest.scala +++ b/core/src/test/scala/besom/util/NonEmptyStringTest.scala @@ -120,24 +120,21 @@ class NonEmptyStringTest extends munit.FunSuite with CompileAssertions: compiles(""" import besom.util.NonEmptyString.* import besom.util.interpolator.{*, given} - import besom.types.{ Context, Output } - given Context = ??? // just to make it compile + import besom.types.Output val x: Output[NonEmptyString] = p"abc${"def"}ghi" """) compiles(""" import besom.util.NonEmptyString.* import besom.util.interpolator.{*, given} - import besom.types.{ Context, Output } - given Context = ??? // just to make it compile + import besom.types.Output val x: Output[NonEmptyString] = pulumi"abc${"def"}ghi" """) failsToCompile(""" import besom.util.NonEmptyString.* import besom.util.interpolator.{*, given} - import besom.types.{ Context, Output } - given Context = ??? // just to make it compile + import besom.types.Output val x: Output[NonEmptyString] = pulumi"${"doesn't matter"}" """) @@ -150,8 +147,7 @@ class NonEmptyStringTest extends munit.FunSuite with CompileAssertions: compiles(""" import besom.util.NonEmptyString.* import besom.util.interpolator.{*, given} - import besom.types.{ Context, Output } - given Context = ??? // just to make it compile + import besom.types.Output def takesNES(nes: Output[NonEmptyString]): Unit = () takesNES(p"abc${"def"}ghi") """) @@ -159,8 +155,7 @@ class NonEmptyStringTest extends munit.FunSuite with CompileAssertions: compiles(""" import besom.util.NonEmptyString.* import besom.util.interpolator.{*, given} - import besom.types.{ Context, Output } - given Context = ??? // just to make it compile + import besom.types.Output def takesNES(nes: Output[NonEmptyString]): Unit = () takesNES(pulumi"abc${"def"}ghi") """) @@ -168,8 +163,7 @@ class NonEmptyStringTest extends munit.FunSuite with CompileAssertions: failsToCompile(""" import besom.util.NonEmptyString.* import besom.util.interpolator.{*, given} - import besom.types.{ Context, Output } - given Context = ??? // just to make it compile + import besom.types.Output def takesNES(nes: Output[NonEmptyString]): Unit = () takesNES(pulumi"${"doesn't matter"}") """) @@ -364,9 +358,8 @@ class NonEmptyStringTest extends munit.FunSuite with CompileAssertions: test("issue 462") { val errors = scala.compiletime.testing.typeCheckErrors(""" import besom.* - given Context = ??? - def requireString(key: NonEmptyString)(using Context): Output[String] = ??? + def requireString(key: NonEmptyString): Output[String] = ??? val s: Output[NonEmptyString] = requireString("stuff") """) @@ -380,9 +373,8 @@ class NonEmptyStringTest extends munit.FunSuite with CompileAssertions: compiles(""" import besom.* - given Context = ??? - def requireString(key: NonEmptyString)(using Context): Output[String] = ??? + def requireString(key: NonEmptyString): Output[String] = ??? val s: Output[NonEmptyString] = requireString("stuff").flatMap(_.toNonEmptyOutput) """) diff --git a/core/src/test/scala/besom/util/URNTest.scala b/core/src/test/scala/besom/util/URNTest.scala index 85d54dab..0f97d7d6 100644 --- a/core/src/test/scala/besom/util/URNTest.scala +++ b/core/src/test/scala/besom/util/URNTest.scala @@ -1,6 +1,6 @@ package besom.util -import besom.types.* +import besom.types.URN class URNTest extends munit.FunSuite with CompileAssertions: diff --git a/crd2besom/project.scala b/crd2besom/project.scala index 8a52ae36..a732a4a2 100644 --- a/crd2besom/project.scala +++ b/crd2besom/project.scala @@ -15,4 +15,4 @@ //> using publish.repository "central" //> using publish.developer "lbialy|Łukasz Biały|https://github.com/lbialy" //> using publish.developer "pawelprazak|Paweł Prażak|https://github.com/pawelprazak" -//> using repository sonatype:snapshots + diff --git a/examples/aws-apigatewayv2-eventbridge/project.scala b/examples/aws-apigatewayv2-eventbridge/project.scala index 473edf51..3b8a2c49 100644 --- a/examples/aws-apigatewayv2-eventbridge/project.scala +++ b/examples/aws-apigatewayv2-eventbridge/project.scala @@ -2,4 +2,6 @@ //> using options -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement //> using dep org.virtuslab::besom-core:0.4.0-SNAPSHOT //> using dep org.virtuslab::besom-aws:6.39.0-core.0.3 -//> using repository sonatype:snapshots + +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/aws-eks/project.scala b/examples/aws-eks/project.scala index c481588e..cf28c503 100644 --- a/examples/aws-eks/project.scala +++ b/examples/aws-eks/project.scala @@ -5,4 +5,5 @@ //> using dep "org.virtuslab::besom-awsx:2.11.0-core.0.3" //> using dep "org.virtuslab::besom-eks:2.6.0-core.0.3" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/aws-redshift-glue-etl/project.scala b/examples/aws-redshift-glue-etl/project.scala index 7e7d4082..c2679809 100644 --- a/examples/aws-redshift-glue-etl/project.scala +++ b/examples/aws-redshift-glue-etl/project.scala @@ -3,4 +3,5 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-aws:6.32.0-core.0.4-SNAPSHOT" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/aws-s3-folder/project.scala b/examples/aws-s3-folder/project.scala index 0ae43328..ce7ae7d0 100644 --- a/examples/aws-s3-folder/project.scala +++ b/examples/aws-s3-folder/project.scala @@ -3,4 +3,5 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-aws:6.39.0-core.0.3" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/aws-secrets-manager/project.scala b/examples/aws-secrets-manager/project.scala index 0ae43328..ce7ae7d0 100644 --- a/examples/aws-secrets-manager/project.scala +++ b/examples/aws-secrets-manager/project.scala @@ -3,4 +3,5 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-aws:6.39.0-core.0.3" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/aws-webserver/project.scala b/examples/aws-webserver/project.scala index 600da501..77c029be 100644 --- a/examples/aws-webserver/project.scala +++ b/examples/aws-webserver/project.scala @@ -5,4 +5,5 @@ //> using dep org.virtuslab::besom-aws:6.39.0-core.0.3 //> using dep org.virtuslab::besom-tls:5.0.3-core.0.3 -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/aws-wordpress-fargate-rds/project.scala b/examples/aws-wordpress-fargate-rds/project.scala index a9654a1b..f10dd72c 100644 --- a/examples/aws-wordpress-fargate-rds/project.scala +++ b/examples/aws-wordpress-fargate-rds/project.scala @@ -4,4 +4,6 @@ //> using dep org.virtuslab::besom-aws:6.39.0-core.0.3 //> using dep org.virtuslab::besom-awsx:2.11.0-core.0.3 //> using dep org.virtuslab::besom-random:4.16.2-core.0.3 -//> using repository sonatype:snapshots + +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/azure-aci/project.scala b/examples/azure-aci/project.scala index 7222e2b9..020887cd 100644 --- a/examples/azure-aci/project.scala +++ b/examples/azure-aci/project.scala @@ -5,4 +5,5 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-azure-native:2.56.0-core.0.4-SNAPSHOT" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/azure-aks-managed-identity/project.scala b/examples/azure-aks-managed-identity/project.scala index d37cf2a0..afda7fd0 100644 --- a/examples/azure-aks-managed-identity/project.scala +++ b/examples/azure-aks-managed-identity/project.scala @@ -6,4 +6,5 @@ //> using dep "org.virtuslab::besom-azure-native:2.44.1-core.0.3" //> using dep "org.virtuslab::besom-tls:5.0.3-core.0.3" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/azure-cosmosdb-logicapp/project.scala b/examples/azure-cosmosdb-logicapp/project.scala index 5d369330..d38fb299 100644 --- a/examples/azure-cosmosdb-logicapp/project.scala +++ b/examples/azure-cosmosdb-logicapp/project.scala @@ -3,4 +3,5 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-azure-native:2.56.0-core.0.4-SNAPSHOT" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/azure-static-website/project.scala b/examples/azure-static-website/project.scala index 2efc2375..0da87b41 100644 --- a/examples/azure-static-website/project.scala +++ b/examples/azure-static-website/project.scala @@ -2,4 +2,6 @@ //> using options -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-azure-native:2.44.1-core.0.3" -//> using repository sonatype:snapshots + +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/azure-synapse/project.scala b/examples/azure-synapse/project.scala index 40dd013c..1818baff 100644 --- a/examples/azure-synapse/project.scala +++ b/examples/azure-synapse/project.scala @@ -3,4 +3,6 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-random:4.16.3-core.0.4-SNAPSHOT" //> using dep "org.virtuslab::besom-azure-native:2.56.0-core.0.4-SNAPSHOT" -//> using repository sonatype:snapshots + +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/azure-webapp-privateendpoint-vnet-injection/project.scala b/examples/azure-webapp-privateendpoint-vnet-injection/project.scala index 8dd1d6c3..d38fb299 100644 --- a/examples/azure-webapp-privateendpoint-vnet-injection/project.scala +++ b/examples/azure-webapp-privateendpoint-vnet-injection/project.scala @@ -2,4 +2,6 @@ //> using options -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-azure-native:2.56.0-core.0.4-SNAPSHOT" -//> using repository sonatype:snapshots + +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/azure-webserver/project.scala b/examples/azure-webserver/project.scala index 2efc2375..0da87b41 100644 --- a/examples/azure-webserver/project.scala +++ b/examples/azure-webserver/project.scala @@ -2,4 +2,6 @@ //> using options -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-azure-native:2.44.1-core.0.3" -//> using repository sonatype:snapshots + +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/docker-multi-container-app/infra/project.scala b/examples/docker-multi-container-app/infra/project.scala index a2bc0f1e..307923a9 100644 --- a/examples/docker-multi-container-app/infra/project.scala +++ b/examples/docker-multi-container-app/infra/project.scala @@ -3,4 +3,5 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-docker:4.5.4-core.0.3" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/gcp-big-query/project.scala b/examples/gcp-big-query/project.scala index d58cd460..15cae84a 100644 --- a/examples/gcp-big-query/project.scala +++ b/examples/gcp-big-query/project.scala @@ -2,4 +2,6 @@ //> using options -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-gcp:7.19.0-core.0.4-SNAPSHOT" -//> using repository sonatype:snapshots + +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/gcp-cloudrun/infra/project.scala b/examples/gcp-cloudrun/infra/project.scala index 6d078477..ab0cc783 100644 --- a/examples/gcp-cloudrun/infra/project.scala +++ b/examples/gcp-cloudrun/infra/project.scala @@ -7,4 +7,6 @@ //> using dep "org.virtuslab::besom-docker:4.5.4-core.0.3" //> using exclude "app/*" -//> using repository sonatype:snapshots + +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/gcp-firebase/project.scala b/examples/gcp-firebase/project.scala index d58cd460..15cae84a 100644 --- a/examples/gcp-firebase/project.scala +++ b/examples/gcp-firebase/project.scala @@ -2,4 +2,6 @@ //> using options -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-gcp:7.19.0-core.0.4-SNAPSHOT" -//> using repository sonatype:snapshots + +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/gcp-functions/project.scala b/examples/gcp-functions/project.scala index 1039d4f4..15cae84a 100644 --- a/examples/gcp-functions/project.scala +++ b/examples/gcp-functions/project.scala @@ -3,4 +3,5 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-gcp:7.19.0-core.0.4-SNAPSHOT" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/gcp-gke/project.scala b/examples/gcp-gke/project.scala index 9164e5b4..3ed54a19 100644 --- a/examples/gcp-gke/project.scala +++ b/examples/gcp-gke/project.scala @@ -2,4 +2,6 @@ //> using options -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-gcp:7.26.0-core.0.3" -//> using repository sonatype:snapshots + +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/gcp-instance-nginx/project.scala b/examples/gcp-instance-nginx/project.scala index 1039d4f4..15cae84a 100644 --- a/examples/gcp-instance-nginx/project.scala +++ b/examples/gcp-instance-nginx/project.scala @@ -3,4 +3,5 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-gcp:7.19.0-core.0.4-SNAPSHOT" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/gcp-static-page/project.scala b/examples/gcp-static-page/project.scala index b0992349..3ed54a19 100644 --- a/examples/gcp-static-page/project.scala +++ b/examples/gcp-static-page/project.scala @@ -3,4 +3,5 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-gcp:7.26.0-core.0.3" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/gcp-webserver/project.scala b/examples/gcp-webserver/project.scala index 9164e5b4..3ed54a19 100644 --- a/examples/gcp-webserver/project.scala +++ b/examples/gcp-webserver/project.scala @@ -2,4 +2,6 @@ //> using options -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-gcp:7.26.0-core.0.3" -//> using repository sonatype:snapshots + +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/kubernetes-guestbook/components/project.scala b/examples/kubernetes-guestbook/components/project.scala index 103ac1c5..5df31fee 100644 --- a/examples/kubernetes-guestbook/components/project.scala +++ b/examples/kubernetes-guestbook/components/project.scala @@ -3,4 +3,6 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-kubernetes:4.13.1-core.0.3" //> using exclude "simple/*" -//> using repository sonatype:snapshots + +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/kubernetes-guestbook/simple/project.scala b/examples/kubernetes-guestbook/simple/project.scala index 710c86d3..00ff8f78 100644 --- a/examples/kubernetes-guestbook/simple/project.scala +++ b/examples/kubernetes-guestbook/simple/project.scala @@ -3,4 +3,6 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-kubernetes:4.13.1-core.0.3" //> using exclude "components/*" -//> using repository sonatype:snapshots + +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/kubernetes-helm-release-wordpress/project.scala b/examples/kubernetes-helm-release-wordpress/project.scala index 35befa92..c5b22365 100644 --- a/examples/kubernetes-helm-release-wordpress/project.scala +++ b/examples/kubernetes-helm-release-wordpress/project.scala @@ -2,4 +2,6 @@ //> using options -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-kubernetes:4.13.1-core.0.3" -//> using repository sonatype:snapshots + +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/kubernetes-keycloak/project.scala b/examples/kubernetes-keycloak/project.scala index a2b05e30..ed944e4e 100644 --- a/examples/kubernetes-keycloak/project.scala +++ b/examples/kubernetes-keycloak/project.scala @@ -6,4 +6,5 @@ //> using dep org.virtuslab::besom-tls:5.0.2-core.0.3 //> using dep org.virtuslab::besom-kubernetes-ingress-nginx:0.0.10-core.0.3 -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/kubernetes-nginx/project.scala b/examples/kubernetes-nginx/project.scala index 3995b804..c5b22365 100644 --- a/examples/kubernetes-nginx/project.scala +++ b/examples/kubernetes-nginx/project.scala @@ -3,4 +3,5 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-kubernetes:4.13.1-core.0.3" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/kubernetes-yaml-crd/project.scala b/examples/kubernetes-yaml-crd/project.scala index 35befa92..c5b22365 100644 --- a/examples/kubernetes-yaml-crd/project.scala +++ b/examples/kubernetes-yaml-crd/project.scala @@ -2,4 +2,6 @@ //> using options -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-kubernetes:4.13.1-core.0.3" -//> using repository sonatype:snapshots + +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/examples/kubernetes-yaml/project.scala b/examples/kubernetes-yaml/project.scala index 3995b804..c5b22365 100644 --- a/examples/kubernetes-yaml/project.scala +++ b/examples/kubernetes-yaml/project.scala @@ -3,4 +3,5 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-kubernetes:4.13.1-core.0.3" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/experimental/project.scala b/experimental/project.scala index 0eba244e..41164d3d 100644 --- a/experimental/project.scala +++ b/experimental/project.scala @@ -3,4 +3,4 @@ //> using dep "org.virtuslab::besom-kubernetes:4.13.1-core.0.3" //> using dep "io.github.iltotore::iron:2.5.0" -//> using repository sonatype:snapshots + diff --git a/integration-tests/CompilerPlugin.test.scala b/integration-tests/CompilerPlugin.test.scala index 66777b2f..dc0b51f0 100644 --- a/integration-tests/CompilerPlugin.test.scala +++ b/integration-tests/CompilerPlugin.test.scala @@ -9,9 +9,9 @@ class CompilerPluginTest extends munit.FunSuite { override val munitTimeout = 1.minute test("compilation should fail with pulumi compiler plugin when using output parameter in an s interpolator") { - val result = scalaCli - .compile(os.pwd / "integration-tests" / "resources" / "compiler-plugin") - .call(cwd = os.pwd, check = false, mergeErrIntoOut = true) + val path = os.pwd / "integration-tests" / "resources" / "compiler-plugin" + pulumi.fixture.setupProject(path) + val result = scalaCli.compile(path).call(cwd = os.pwd, check = false, mergeErrIntoOut = true) val output = result.out.text() assert(output.contains("is used in a default string interpolator."), clue = output) assertEquals(result.exitCode, 1) diff --git a/integration-tests/LanguagePluginTest.test.scala b/integration-tests/LanguagePluginTest.test.scala index 990c71f7..025fd74c 100644 --- a/integration-tests/LanguagePluginTest.test.scala +++ b/integration-tests/LanguagePluginTest.test.scala @@ -17,6 +17,7 @@ class LanguagePluginTest extends munit.FunSuite { .filterNot(tags(Slow)) val wd = os.pwd / "integration-tests" + val besomVersion = os.read(os.pwd / "version.txt").trim val resourcesDir = wd / "resources" val executorsDir = resourcesDir / "executors" val bootstrapLibJarPath = languagePluginDir / "bootstrap.jar" @@ -217,7 +218,7 @@ class LanguagePluginTest extends munit.FunSuite { .map(plugin => plugin("name").str -> plugin("version").strOpt.getOrElse("null")) .toMap - val expectedAboutPluginsVersions = Map("scala" -> "null" /* FIXME */, "random" -> "4.3.1", "aci" -> "0.0.6") + val expectedAboutPluginsVersions = Map("scala" -> besomVersion, "random" -> "4.3.1", "aci" -> "0.0.6") assert { clue(aboutInfoJson) clue(aboutPluginsVersions) == clue(expectedAboutPluginsVersions) diff --git a/integration-tests/integration.scala b/integration-tests/integration.scala index 59512c5a..ad9d9332 100644 --- a/integration-tests/integration.scala +++ b/integration-tests/integration.scala @@ -22,8 +22,6 @@ val defaultProjectFile = |//> using options -java-output-version:$javaVersion -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement |//> using plugin org.virtuslab::besom-compiler-plugin:$coreVersion |//> using dep org.virtuslab::besom-core:$coreVersion - | - |//> using repository sonatype:snapshots |""".stripMargin def sanitizeName(name: String): String = name.replaceAll("[^a-zA-Z0-9]", "-").toLowerCase().take(40).stripSuffix("-") @@ -31,27 +29,30 @@ def testToStack(name: String): String = "tests-" + sanitizeName(name) //noinspection TypeAnnotation,ScalaWeakerAccess object pulumi { - def login(pulumiHome: os.Path) = pproc("pulumi", "--non-interactive", "--logtostderr", "login", s"file://$pulumiHome") + def login(pulumiHome: os.Path) = + pproc("pulumi", "--non-interactive", "--logtostderr", "-v=10", "--logflow", "login", s"file://$pulumiHome") def logout(pulumiHome: os.Path) = pproc("pulumi", "--non-interactive", "--logtostderr", "logout", s"file://$pulumiHome") def stackInit(stackName: String) = - pproc("pulumi", "--non-interactive", "--logtostderr", "stack", "init", "--stack", stackName) + pproc("pulumi", "--non-interactive", "--logtostderr", "-v=10", "--logflow", "stack", "init", "--stack", stackName) def stackRm(stackName: String) = - pproc("pulumi", "--non-interactive", "--logtostderr", "stack", "rm", "-y", "--stack", stackName) + pproc("pulumi", "--non-interactive", "--logtostderr", "-v=10", "--logflow", "stack", "rm", "-y", "--stack", stackName) def stackLs() = - pproc("pulumi", "--non-interactive", "--logtostderr", "stack", "ls", "--json") + pproc("pulumi", "--non-interactive", "--logtostderr", "-v=10", "--logflow", "stack", "ls", "--json") def preview(stackName: String, additional: os.Shellable*) = - pproc("pulumi", "--non-interactive", "--logtostderr", "preview", "--stack", stackName, additional) + pproc("pulumi", "--non-interactive", "--logtostderr", "-v=10", "--logflow", "preview", "--stack", stackName, additional) def up(stackName: String, additional: os.Shellable*) = pproc( "pulumi", "--non-interactive", "--logtostderr", + "-v=10", + "--logflow", "up", "--stack", stackName, @@ -63,6 +64,8 @@ object pulumi { "pulumi", "--non-interactive", "--logtostderr", + "-v=10", + "--logflow", "destroy", "--stack", stackName, @@ -74,6 +77,8 @@ object pulumi { "pulumi", "--non-interactive", "--logtostderr", + "-v=10", + "--logflow", "config", "--stack", stackName, @@ -85,6 +90,8 @@ object pulumi { "pulumi", "--non-interactive", "--logtostderr", + "-v=10", + "--logflow", "config", "--stack", stackName, @@ -97,6 +104,8 @@ object pulumi { "pulumi", "--non-interactive", "--logtostderr", + "-v=10", + "--logflow", "stack", "output", "--stack", @@ -110,6 +119,8 @@ object pulumi { "pulumi", "--non-interactive", "--logtostderr", + "-v=10", + "--logflow", "plugin", "install", "language", @@ -158,6 +169,13 @@ object pulumi { ) object fixture { + def setupProject(testDir: os.Path, projectFiles: Map[String, String] = Map("project.scala" -> defaultProjectFile)): Unit = + projectFiles.foreach { case (name, content) => + val file = testDir / name + println(s"Writing test file: ${file.relativeTo(os.pwd)}") + os.write.over(file, content) + } + def setup( opts: FixtureOpts, args: FixtureArgs* @@ -184,7 +202,8 @@ object pulumi { val allEnv: Map[String, String] = opts.pulumiEnv ++ Map( "PULUMI_HOME" -> (opts.pulumiHomeDir / ".pulumi").toString, - "PULUMI_SKIP_UPDATE_CHECK" -> "true" + "PULUMI_SKIP_UPDATE_CHECK" -> "true", + "TF_LOG" -> "TRACE" ) pulumi.login(opts.pulumiHomeDir).call(cwd = opts.pulumiHomeDir, env = allEnv) pulumi.installScalaPlugin().call(cwd = opts.pulumiHomeDir, env = allEnv) @@ -197,7 +216,8 @@ object pulumi { Map( "PULUMI_CONFIG_PASSPHRASE" -> envVarOpt("PULUMI_CONFIG_PASSPHRASE").getOrElse("") ) ++ pulumiContext.env ++ Map( // don't override test-critical env vars - "PULUMI_STACK" -> stackName + "PULUMI_STACK" -> stackName, + "TF_LOG" -> "TRACE" ) println(s"Test stack: $stackName") @@ -221,13 +241,13 @@ object pulumi { } def destroy(ctx: ProgramContext): Unit = { - pulumi.destroy(ctx.stackName).call(cwd = ctx.programDir, env = ctx.env) - pulumi.stackRm(ctx.stackName).call(cwd = ctx.programDir, env = ctx.env) + pulumi.destroy(ctx.stackName).call(cwd = ctx.programDir, env = ctx.env ++ Map("TF_LOG" -> "TRACE")) + pulumi.stackRm(ctx.stackName).call(cwd = ctx.programDir, env = ctx.env ++ Map("TF_LOG" -> "TRACE")) // purposely not deleting project.scala to make editing tests easier } def logout(ctx: PulumiContext): Unit = { - pulumi.logout(ctx.home).call(cwd = ctx.home, env = ctx.env) + pulumi.logout(ctx.home).call(cwd = ctx.home, env = ctx.env ++ Map("TF_LOG" -> "TRACE")) } } } diff --git a/integration-tests/project.scala b/integration-tests/project.scala index 95cc1f68..ffd6cd96 100644 --- a/integration-tests/project.scala +++ b/integration-tests/project.scala @@ -6,4 +6,4 @@ //> using dep org.virtuslab::besom-scripts:0.4.0-SNAPSHOT //> using dep org.scalameta::munit::1.0.0-M10 -//> using repository sonatype:snapshots + diff --git a/integration-tests/resources/cats-purrl-example/project.scala b/integration-tests/resources/cats-purrl-example/project.scala deleted file mode 100644 index de7314ab..00000000 --- a/integration-tests/resources/cats-purrl-example/project.scala +++ /dev/null @@ -1,8 +0,0 @@ -//> using scala 3.3.1 -//> using options -java-output-version:11 -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement -//> using plugin org.virtuslab::besom-compiler-plugin:0.4.0-SNAPSHOT -//> using dep org.virtuslab::besom-core:0.4.0-SNAPSHOT - -//> using dep org.virtuslab::besom-cats:0.4.0-SNAPSHOT -//> using dep "org.virtuslab::besom-purrl:0.5.0-core.0.3" -//> using repository sonatype:snapshots diff --git a/integration-tests/resources/compiler-plugin/project.scala b/integration-tests/resources/compiler-plugin/project.scala deleted file mode 100644 index 4409a85a..00000000 --- a/integration-tests/resources/compiler-plugin/project.scala +++ /dev/null @@ -1,6 +0,0 @@ -//> using scala 3.3.1 -//> using options -java-output-version:11 -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement -//> using plugin org.virtuslab::besom-compiler-plugin:0.4.0-SNAPSHOT -//> using dep org.virtuslab::besom-core:0.4.0-SNAPSHOT - -//> using repository sonatype:snapshots diff --git a/integration-tests/resources/config-example/project.scala b/integration-tests/resources/config-example/project.scala deleted file mode 100644 index 4409a85a..00000000 --- a/integration-tests/resources/config-example/project.scala +++ /dev/null @@ -1,6 +0,0 @@ -//> using scala 3.3.1 -//> using options -java-output-version:11 -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement -//> using plugin org.virtuslab::besom-compiler-plugin:0.4.0-SNAPSHOT -//> using dep org.virtuslab::besom-core:0.4.0-SNAPSHOT - -//> using repository sonatype:snapshots diff --git a/integration-tests/resources/executors/gradle/build.gradle.kts b/integration-tests/resources/executors/gradle/build.gradle.kts deleted file mode 100644 index cdbca5ec..00000000 --- a/integration-tests/resources/executors/gradle/build.gradle.kts +++ /dev/null @@ -1,27 +0,0 @@ -plugins { - scala - application -} - -repositories { - mavenLocal() - mavenCentral() -} - -dependencies { - implementation("org.scala-lang:scala3-library_3:3.3.1") - implementation("org.virtuslab:besom-core_3:0.3.2") - implementation("org.virtuslab:besom-fake-standard-resource_3:1.2.3-TEST") - implementation("org.virtuslab:besom-fake-external-resource_3:2.3.4-TEST") - if (project.hasProperty("besomBootstrapJar")) runtimeOnly(files(project.property("besomBootstrapJar") as String)) -} - -application { - mainClass.set( - if (project.hasProperty("mainClass")) { - project.property("mainClass") as String - } else { - "besom.languageplugin.test.pulumiapp.run" - } - ) -} diff --git a/integration-tests/resources/executors/maven/pom.xml b/integration-tests/resources/executors/maven/pom.xml deleted file mode 100644 index e3276155..00000000 --- a/integration-tests/resources/executors/maven/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ - - 4.0.0 - - org.virtuslab.example - infra - 1.0-SNAPSHOT - - - UTF-8 - 11 - 11 - ${project.groupId}.${project.artifactId}.run - - - - - - default-pulumi-java-sdk-dependency - - - besomBootstrapJar - - - - - org.virtuslab - besom-bootstrap_3 - 0.3.2 - system - ${besomBootstrapJar} - - - - - - - - org.scala-lang - scala3-library_3 - 3.3.3 - - - org.virtuslab - besom-core_3 - 0.3.2 - - - org.virtuslab - besom-fake-standard-resource_3 - 1.2.3-TEST - - - org.virtuslab - besom-fake-external-resource_3 - 2.3.4-TEST - - - - - src/main/scala - - - net.alchim31.maven - scala-maven-plugin - 4.8.1 - - - - compile - testCompile - - - - - - org.apache.maven.plugins - maven-wrapper-plugin - 3.2.0 - - 3.9.6 - - - - - diff --git a/integration-tests/resources/executors/sbt/build.sbt b/integration-tests/resources/executors/sbt/build.sbt deleted file mode 100644 index b750f37f..00000000 --- a/integration-tests/resources/executors/sbt/build.sbt +++ /dev/null @@ -1,12 +0,0 @@ -lazy val root = project - .in(file(".")) - .settings( - scalaVersion := "3.3.1", - scalacOptions ++= Seq("-java-output-version", "11"), - javacOptions in (Compile, compile) ++= Seq("-source", "11", "-target", "11"), - libraryDependencies ++= Seq( - "org.virtuslab" %% "besom-core" % "0.3.2", - "org.virtuslab" %% "besom-fake-standard-resource" % "1.2.3-TEST", - "org.virtuslab" %% "besom-fake-external-resource" % "2.3.4-TEST" - ) - ) diff --git a/integration-tests/resources/executors/scala-cli/project.scala b/integration-tests/resources/executors/scala-cli/project.scala deleted file mode 100644 index d8921b70..00000000 --- a/integration-tests/resources/executors/scala-cli/project.scala +++ /dev/null @@ -1,7 +0,0 @@ -//> using scala 3.3.1 -//> using options -java-output-version:11 -//> using plugin "org.virtuslab::besom-compiler-plugin:0.4.0-SNAPSHOT" -//> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" -//> using dep "org.virtuslab::besom-fake-standard-resource:1.2.3-TEST" -//> using dep "org.virtuslab::besom-fake-external-resource:2.3.4-TEST" -//> using repository sonatype:snapshots diff --git a/integration-tests/resources/kubernetes-secrets/project.scala b/integration-tests/resources/kubernetes-secrets/project.scala deleted file mode 100644 index 91f8526b..00000000 --- a/integration-tests/resources/kubernetes-secrets/project.scala +++ /dev/null @@ -1,7 +0,0 @@ -//> using scala 3.3.1 -//> using options -java-output-version:11 -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement -//> using plugin org.virtuslab::besom-compiler-plugin:0.4.0-SNAPSHOT -//> using dep org.virtuslab::besom-core:0.4.0-SNAPSHOT - -//> using dep "org.virtuslab::besom-kubernetes:4.13.1-core.0.3" -//> using repository sonatype:snapshots diff --git a/integration-tests/resources/logger-example/project.scala b/integration-tests/resources/logger-example/project.scala deleted file mode 100644 index 4409a85a..00000000 --- a/integration-tests/resources/logger-example/project.scala +++ /dev/null @@ -1,6 +0,0 @@ -//> using scala 3.3.1 -//> using options -java-output-version:11 -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement -//> using plugin org.virtuslab::besom-compiler-plugin:0.4.0-SNAPSHOT -//> using dep org.virtuslab::besom-core:0.4.0-SNAPSHOT - -//> using repository sonatype:snapshots diff --git a/integration-tests/resources/memoization/source-stack/project.scala b/integration-tests/resources/memoization/source-stack/project.scala deleted file mode 100644 index 6ecced88..00000000 --- a/integration-tests/resources/memoization/source-stack/project.scala +++ /dev/null @@ -1,7 +0,0 @@ -//> using scala 3.3.1 -//> using options -java-output-version:11 -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement -//> using plugin org.virtuslab::besom-compiler-plugin:0.4.0-SNAPSHOT -//> using dep org.virtuslab::besom-core:0.4.0-SNAPSHOT - -//> using dep "org.virtuslab::besom-tls:5.0.3-core.0.3" -//> using repository sonatype:snapshots diff --git a/integration-tests/resources/memoization/target-stack/project.scala b/integration-tests/resources/memoization/target-stack/project.scala deleted file mode 100644 index 4409a85a..00000000 --- a/integration-tests/resources/memoization/target-stack/project.scala +++ /dev/null @@ -1,6 +0,0 @@ -//> using scala 3.3.1 -//> using options -java-output-version:11 -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement -//> using plugin org.virtuslab::besom-compiler-plugin:0.4.0-SNAPSHOT -//> using dep org.virtuslab::besom-core:0.4.0-SNAPSHOT - -//> using repository sonatype:snapshots diff --git a/integration-tests/resources/random-example/project.scala b/integration-tests/resources/random-example/project.scala deleted file mode 100644 index 6f6659c0..00000000 --- a/integration-tests/resources/random-example/project.scala +++ /dev/null @@ -1,7 +0,0 @@ -//> using scala 3.3.1 -//> using options -java-output-version:11 -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement -//> using plugin org.virtuslab::besom-compiler-plugin:0.4.0-SNAPSHOT -//> using dep org.virtuslab::besom-core:0.4.0-SNAPSHOT - -//> using dep "org.virtuslab::besom-random:4.16.2-core.0.3" -//> using repository sonatype:snapshots diff --git a/integration-tests/resources/references/source-stack/project.scala b/integration-tests/resources/references/source-stack/project.scala deleted file mode 100644 index 6ecced88..00000000 --- a/integration-tests/resources/references/source-stack/project.scala +++ /dev/null @@ -1,7 +0,0 @@ -//> using scala 3.3.1 -//> using options -java-output-version:11 -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement -//> using plugin org.virtuslab::besom-compiler-plugin:0.4.0-SNAPSHOT -//> using dep org.virtuslab::besom-core:0.4.0-SNAPSHOT - -//> using dep "org.virtuslab::besom-tls:5.0.3-core.0.3" -//> using repository sonatype:snapshots diff --git a/integration-tests/resources/references/target-stack/project.scala b/integration-tests/resources/references/target-stack/project.scala deleted file mode 100644 index 4409a85a..00000000 --- a/integration-tests/resources/references/target-stack/project.scala +++ /dev/null @@ -1,6 +0,0 @@ -//> using scala 3.3.1 -//> using options -java-output-version:11 -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement -//> using plugin org.virtuslab::besom-compiler-plugin:0.4.0-SNAPSHOT -//> using dep org.virtuslab::besom-core:0.4.0-SNAPSHOT - -//> using repository sonatype:snapshots diff --git a/integration-tests/resources/tls-example/project.scala b/integration-tests/resources/tls-example/project.scala deleted file mode 100644 index 6ecced88..00000000 --- a/integration-tests/resources/tls-example/project.scala +++ /dev/null @@ -1,7 +0,0 @@ -//> using scala 3.3.1 -//> using options -java-output-version:11 -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement -//> using plugin org.virtuslab::besom-compiler-plugin:0.4.0-SNAPSHOT -//> using dep org.virtuslab::besom-core:0.4.0-SNAPSHOT - -//> using dep "org.virtuslab::besom-tls:5.0.3-core.0.3" -//> using repository sonatype:snapshots diff --git a/integration-tests/resources/zio-tls-example/project.scala b/integration-tests/resources/zio-tls-example/project.scala deleted file mode 100644 index 52cc06c1..00000000 --- a/integration-tests/resources/zio-tls-example/project.scala +++ /dev/null @@ -1,8 +0,0 @@ -//> using scala 3.3.1 -//> using options -java-output-version:11 -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement -//> using plugin org.virtuslab::besom-compiler-plugin:0.4.0-SNAPSHOT -//> using dep org.virtuslab::besom-core:0.4.0-SNAPSHOT - -//> using dep org.virtuslab::besom-zio:0.4.0-SNAPSHOT -//> using dep "org.virtuslab::besom-tls:5.0.3-core.0.3" -//> using repository sonatype:snapshots diff --git a/language-plugin/bootstrap/project.scala b/language-plugin/bootstrap/project.scala index 8fb81511..a922844a 100644 --- a/language-plugin/bootstrap/project.scala +++ b/language-plugin/bootstrap/project.scala @@ -4,4 +4,4 @@ //> using dep org.virtuslab::besom-json:0.4.0-SNAPSHOT //> using dep io.github.classgraph:classgraph:4.8.165 -//> using repository sonatype:snapshots + diff --git a/scripts/Proto.scala b/scripts/Proto.scala index c9d826d4..c9fe1b7d 100644 --- a/scripts/Proto.scala +++ b/scripts/Proto.scala @@ -93,7 +93,7 @@ private def compileProto(cwd: os.Path, protoPath: os.Path): Unit = val files = os.walk(protoPath).filter(_.ext == "proto") - val scalaOut = cwd / "core" / "src" / "main" / "scala" / "besom" / "rpc" + val scalaOut = cwd / "besom-rpc" / "src" / "main" / "scala" os.remove.all(scalaOut) os.makeDir.all(scalaOut) @@ -101,7 +101,7 @@ private def compileProto(cwd: os.Path, protoPath: os.Path): Unit = val protoc = os.proc( "protoc", s"--plugin=$pluginPath", - s"--scala_out=grpc:$scalaOut", + s"--scala_out=scala3_sources,grpc:$scalaOut", files.map(_.relativeTo(protoPath)) ) println(s"running [$protoPath]: ${protoc.commandChunks.mkString(" ")}") diff --git a/scripts/project.scala b/scripts/project.scala index 5cef34d1..9848ee86 100644 --- a/scripts/project.scala +++ b/scripts/project.scala @@ -23,4 +23,4 @@ //> using publish.developer "prolativ|Michał Pałka|https://github.com/prolativ" //> using publish.developer "KacperFKorban|Kacper Korban|https://github.com/KacperFKorban" //> using publish.developer "pawelprazak|Paweł Prażak|https://github.com/pawelprazak" -//> using repository sonatype:snapshots + diff --git a/templates/aws/project.scala b/templates/aws/project.scala index 0ae43328..ce7ae7d0 100644 --- a/templates/aws/project.scala +++ b/templates/aws/project.scala @@ -3,4 +3,5 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-aws:6.39.0-core.0.3" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/templates/default/project.scala b/templates/default/project.scala index e66dd93b..77737a67 100644 --- a/templates/default/project.scala +++ b/templates/default/project.scala @@ -3,4 +3,5 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-random:4.16.2-core.0.3" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/templates/gcp/project.scala b/templates/gcp/project.scala index b0992349..3ed54a19 100644 --- a/templates/gcp/project.scala +++ b/templates/gcp/project.scala @@ -3,4 +3,5 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-gcp:7.26.0-core.0.3" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file diff --git a/templates/kubernetes/project.scala b/templates/kubernetes/project.scala index 3995b804..c5b22365 100644 --- a/templates/kubernetes/project.scala +++ b/templates/kubernetes/project.scala @@ -3,4 +3,5 @@ //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT" //> using dep "org.virtuslab::besom-kubernetes:4.13.1-core.0.3" -//> using repository sonatype:snapshots +// TODO: remove after 0.4.0 release +//> using repository sonatype:snapshots \ No newline at end of file