Renaming packages

andrzejressel · Mar 10, 2024 · c5c8091 · c5c8091
1 parent b8f2c09
commit c5c8091
Show file tree

Hide file tree

Showing 48 changed files with 74 additions and 89 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,23 +6,15 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-pulumi_rust = { path = "pulumi_rust" }
-tokio.workspace = true
-log.workspace = true
-anyhow.workspace = true
-tonic = { workspace = true, default-features = true }
-prost-types.workspace = true
-clap.workspace = true
-log4rs.workspace = true
 
 [workspace]
 members = [
-    "pulumi_rust",
+    "pulumi_wasm_runner",
     "pulumi_wasm",
-    "pulumi_wasm_random",
-    "pulumi_wasm_main",
-    "pulumi_rust_wasm",
-    "wasm_common"
+    "providers/pulumi_wasm_provider_random",
+    "pulumi_wasm_rust",
+    "wasm_common",
+    "examples/simple"
 ]
 
 [workspace.dependencies]

diff --git a/entrypoint.bat b/entrypoint.bat
@@ -4,4 +4,4 @@
 
 @REM cargo run -- run --wasm target/wasm32-wasi/debug/composed2.wasm
 
-.\run.bat && cargo run -- run --wasm target/wasm32-wasi/debug/composed2.wasm
+.\run.bat && cargo run -p pulumi_wasm_runner -- run --wasm target/wasm32-wasi/debug/composed2.wasm
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -4,4 +4,4 @@ set -e
 
 ./run.sh
 
-cargo run -- run --wasm target/wasm32-wasi/debug/composed2.wasm
+cargo run -p pulumi_wasm_runner -- run --wasm target/wasm32-wasi/debug/composed2.wasm
diff --git a/pulumi_wasm_main/Cargo.toml → examples/simple/Cargo.toml b/pulumi_wasm_main/Cargo.toml → examples/simple/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "pulumi_wasm_main"
+name = "pulumi_wasm_example_simple"
 version = "0.1.0"
 edition = "2021"
 
@@ -24,9 +24,9 @@ rmpv.workspace = true
 serde.workspace = true
 tonic.workspace = true
 serde_json.workspace = true
-pulumi_rust_wasm = { path = "../pulumi_rust_wasm" }
+pulumi_rust_wasm = { path = "../../pulumi_wasm_rust" }
 log.workspace = true
-wasm_common = { path = "../wasm_common" }
+wasm_common = { path = "../../wasm_common" }
 
 [dev-dependencies]
 wasmtime.workspace = true
@@ -36,5 +36,5 @@ wasmtime-wasi.workspace = true
 package = "component:pulumi-wasm-main"
 
 [package.metadata.component.target]
-path = "../wits/world.wit"
+path = "../../wits/world.wit"
 world = "new-main"
diff --git a/pulumi_wasm_main/src/bindings.rs → examples/simple/src/bindings.rs b/pulumi_wasm_main/src/bindings.rs → examples/simple/src/bindings.rs
diff --git a/pulumi_wasm_main/src/lib.rs → examples/simple/src/lib.rs b/pulumi_wasm_main/src/lib.rs → examples/simple/src/lib.rs
@@ -26,7 +26,7 @@ impl Guest for Component {
         let length: Output<i32> = Output::new(&1).map(|i: i32| i * 3);
 
         let _v = create_random_string(RandomStringArgs {
-            name: "test1234",
+            name: "test123456",
             length,
         });
 

diff --git a/pulumi_wasm_main/src/random.rs → examples/simple/src/random.rs b/pulumi_wasm_main/src/random.rs → examples/simple/src/random.rs
diff --git a/pulumi_wasm_random/Cargo.toml → ...rs/pulumi_wasm_provider_random/Cargo.toml b/pulumi_wasm_random/Cargo.toml → ...rs/pulumi_wasm_provider_random/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "pulumi_wasm_random"
+name = "pulumi_wasm_provider_random"
 version = "0.1.0"
 edition = "2021"
 
@@ -25,7 +25,7 @@ serde.workspace = true
 tonic.workspace = true
 serde_json.workspace = true
 log.workspace = true
-wasm_common = { path = "../wasm_common" }
+wasm_common = { path = "../../wasm_common" }
 
 [dev-dependencies]
 wasmtime.workspace = true
@@ -35,5 +35,5 @@ wasmtime-wasi.workspace = true
 package = "component:pulumi-provider-random"
 
 [package.metadata.component.target]
-path = "../wits/world.wit"
+path = "../../wits/world.wit"
 world = "pulumi-provider-random"
diff --git a/pulumi_wasm_random/src/bindings.rs → ...lumi_wasm_provider_random/src/bindings.rs b/pulumi_wasm_random/src/bindings.rs → ...lumi_wasm_provider_random/src/bindings.rs
diff --git a/pulumi_wasm_random/src/lib.rs → ...rs/pulumi_wasm_provider_random/src/lib.rs b/pulumi_wasm_random/src/lib.rs → ...rs/pulumi_wasm_provider_random/src/lib.rs
diff --git a/pulumi_rust/src/lib.rs b/pulumi_rust/src/lib.rs
diff --git a/pulumi_rust/Cargo.toml → pulumi_wasm_runner/Cargo.toml b/pulumi_rust/Cargo.toml → pulumi_wasm_runner/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "pulumi_rust"
+name = "pulumi_wasm_runner"
 version = "0.1.0"
 edition = "2021"
 
@@ -22,6 +22,9 @@ serde_json.workspace = true
 futures.workspace = true
 async-trait.workspace = true
 regex.workspace = true
+tokio.workspace = true
+log4rs.workspace = true
+clap.workspace = true
 
 [build-dependencies]
 tonic-build.workspace = true
diff --git a/pulumi_rust/build.rs → pulumi_wasm_runner/build.rs b/pulumi_rust/build.rs → pulumi_wasm_runner/build.rs
diff --git a/pulumi_rust/proto/google/protobuf/any.proto → ...sm_runner/proto/google/protobuf/any.proto b/pulumi_rust/proto/google/protobuf/any.proto → ...sm_runner/proto/google/protobuf/any.proto
diff --git a/pulumi_rust/proto/google/protobuf/api.proto → ...sm_runner/proto/google/protobuf/api.proto b/pulumi_rust/proto/google/protobuf/api.proto → ...sm_runner/proto/google/protobuf/api.proto
diff --git a/...st/proto/google/protobuf/descriptor.proto → ...er/proto/google/protobuf/descriptor.proto b/...st/proto/google/protobuf/descriptor.proto → ...er/proto/google/protobuf/descriptor.proto
diff --git a/...rust/proto/google/protobuf/duration.proto → ...nner/proto/google/protobuf/duration.proto b/...rust/proto/google/protobuf/duration.proto → ...nner/proto/google/protobuf/duration.proto
diff --git a/...mi_rust/proto/google/protobuf/empty.proto → ..._runner/proto/google/protobuf/empty.proto b/...mi_rust/proto/google/protobuf/empty.proto → ..._runner/proto/google/protobuf/empty.proto
diff --git a/...st/proto/google/protobuf/field_mask.proto → ...er/proto/google/protobuf/field_mask.proto b/...st/proto/google/protobuf/field_mask.proto → ...er/proto/google/protobuf/field_mask.proto
diff --git a/...roto/google/protobuf/source_context.proto → ...roto/google/protobuf/source_context.proto b/...roto/google/protobuf/source_context.proto → ...roto/google/protobuf/source_context.proto
diff --git a/...i_rust/proto/google/protobuf/struct.proto → ...runner/proto/google/protobuf/struct.proto b/...i_rust/proto/google/protobuf/struct.proto → ...runner/proto/google/protobuf/struct.proto
diff --git a/...ust/proto/google/protobuf/timestamp.proto → ...ner/proto/google/protobuf/timestamp.proto b/...ust/proto/google/protobuf/timestamp.proto → ...ner/proto/google/protobuf/timestamp.proto
diff --git a/pulumi_rust/proto/google/protobuf/type.proto → ...m_runner/proto/google/protobuf/type.proto b/pulumi_rust/proto/google/protobuf/type.proto → ...m_runner/proto/google/protobuf/type.proto
diff --git a/...rust/proto/google/protobuf/wrappers.proto → ...nner/proto/google/protobuf/wrappers.proto b/...rust/proto/google/protobuf/wrappers.proto → ...nner/proto/google/protobuf/wrappers.proto
diff --git a/pulumi_rust/proto/pulumi/alias.proto → pulumi_wasm_runner/proto/pulumi/alias.proto b/pulumi_rust/proto/pulumi/alias.proto → pulumi_wasm_runner/proto/pulumi/alias.proto
diff --git a/pulumi_rust/proto/pulumi/analyzer.proto → ...i_wasm_runner/proto/pulumi/analyzer.proto b/pulumi_rust/proto/pulumi/analyzer.proto → ...i_wasm_runner/proto/pulumi/analyzer.proto
diff --git a/pulumi_rust/proto/pulumi/codegen/hcl.proto → ...asm_runner/proto/pulumi/codegen/hcl.proto b/pulumi_rust/proto/pulumi/codegen/hcl.proto → ...asm_runner/proto/pulumi/codegen/hcl.proto
diff --git a/...mi_rust/proto/pulumi/codegen/loader.proto → ..._runner/proto/pulumi/codegen/loader.proto b/...mi_rust/proto/pulumi/codegen/loader.proto → ..._runner/proto/pulumi/codegen/loader.proto
diff --git a/...mi_rust/proto/pulumi/codegen/mapper.proto → ..._runner/proto/pulumi/codegen/mapper.proto b/...mi_rust/proto/pulumi/codegen/mapper.proto → ..._runner/proto/pulumi/codegen/mapper.proto
diff --git a/pulumi_rust/proto/pulumi/converter.proto → ..._wasm_runner/proto/pulumi/converter.proto b/pulumi_rust/proto/pulumi/converter.proto → ..._wasm_runner/proto/pulumi/converter.proto
diff --git a/pulumi_rust/proto/pulumi/engine.proto → pulumi_wasm_runner/proto/pulumi/engine.proto b/pulumi_rust/proto/pulumi/engine.proto → pulumi_wasm_runner/proto/pulumi/engine.proto
diff --git a/pulumi_rust/proto/pulumi/errors.proto → pulumi_wasm_runner/proto/pulumi/errors.proto b/pulumi_rust/proto/pulumi/errors.proto → pulumi_wasm_runner/proto/pulumi/errors.proto
diff --git a/pulumi_rust/proto/pulumi/language.proto → ...i_wasm_runner/proto/pulumi/language.proto b/pulumi_rust/proto/pulumi/language.proto → ...i_wasm_runner/proto/pulumi/language.proto
diff --git a/pulumi_rust/proto/pulumi/plugin.proto → pulumi_wasm_runner/proto/pulumi/plugin.proto b/pulumi_rust/proto/pulumi/plugin.proto → pulumi_wasm_runner/proto/pulumi/plugin.proto
diff --git a/pulumi_rust/proto/pulumi/provider.proto → ...i_wasm_runner/proto/pulumi/provider.proto b/pulumi_rust/proto/pulumi/provider.proto → ...i_wasm_runner/proto/pulumi/provider.proto
diff --git a/pulumi_rust/proto/pulumi/resource.proto → ...i_wasm_runner/proto/pulumi/resource.proto b/pulumi_rust/proto/pulumi/resource.proto → ...i_wasm_runner/proto/pulumi/resource.proto
diff --git a/pulumi_rust/proto/pulumi/source.proto → pulumi_wasm_runner/proto/pulumi/source.proto b/pulumi_rust/proto/pulumi/source.proto → pulumi_wasm_runner/proto/pulumi/source.proto
diff --git a/..._rust/proto/pulumi/testing/language.proto → ...unner/proto/pulumi/testing/language.proto b/..._rust/proto/pulumi/testing/language.proto → ...unner/proto/pulumi/testing/language.proto
diff --git a/src/main.rs → pulumi_wasm_runner/src/main.rs b/src/main.rs → pulumi_wasm_runner/src/main.rs
@@ -5,8 +5,15 @@ use log4rs::Config;
 use log4rs::config::{Appender, Root};
 use log4rs::encode::json::JsonEncoder;
 use log::LevelFilter;
+use crate::pulumi::{Pulumi, WasmFile};
 
-use pulumi_rust::pulumi::{Pulumi, WasmFile};
+mod pulumi;
+
+mod grpc {
+    #![allow(clippy::all)]
+    #![allow(clippy::pedantic)]
+    tonic::include_proto!("pulumirpc");
+}
 
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]

diff --git a/pulumi_rust/src/pulumi.rs → pulumi_wasm_runner/src/pulumi.rs b/pulumi_rust/src/pulumi.rs → pulumi_wasm_runner/src/pulumi.rs
diff --git a/pulumi_rust_wasm/Cargo.toml → pulumi_wasm_rust/Cargo.toml b/pulumi_rust_wasm/Cargo.toml → pulumi_wasm_rust/Cargo.toml
diff --git a/pulumi_rust_wasm/src/bindings.rs → pulumi_wasm_rust/src/bindings.rs b/pulumi_rust_wasm/src/bindings.rs → pulumi_wasm_rust/src/bindings.rs
diff --git a/pulumi_rust_wasm/src/lib.rs → pulumi_wasm_rust/src/lib.rs b/pulumi_rust_wasm/src/lib.rs → pulumi_wasm_rust/src/lib.rs
diff --git a/pulumi_rust_wasm/src/output.rs → pulumi_wasm_rust/src/output.rs b/pulumi_rust_wasm/src/output.rs → pulumi_wasm_rust/src/output.rs
diff --git a/run.bat b/run.bat
@@ -1,29 +1,27 @@
 cargo component build -p wasm_common || exit /b 1
 cargo component build -p pulumi_wasm || exit /b 1
-cargo component build -p pulumi_wasm_random || exit /b 1
-cargo component build -p pulumi_rust_wasm || exit /b 1
-cargo component build -p pulumi_wasm_main || exit /b 1
+cargo component build -p pulumi_wasm_provider_random || exit /b 1
+cargo component build -p pulumi_wasm_example_simple || exit /b 1
 cargo build || exit /b 1
 @REM cargo build -p pulumi_rust_wasm || exit /b
-@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi_wasm_main.wasm
+@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi_wasm_example_simple.wasm
 @REM
 echo F|xcopy /b /v /y ".\target\wasm32-wasi\debug\pulumi_wasm.wasm" ".\target\wasm32-wasi\debug\pulumi-wasm.wasm" || exit /b 1
-echo F|xcopy /b /v /y ".\target\wasm32-wasi\debug\pulumi_wasm_main.wasm" ".\target\wasm32-wasi\debug\pulumi-wasm-main.wasm" || exit /b 1
-echo F|xcopy /b /v /y ".\target\wasm32-wasi\debug\pulumi_wasm_random.wasm" ".\target\wasm32-wasi\debug\pulumi-wasm-random.wasm" || exit /b 1
-echo F|xcopy /b /v /y ".\target\wasm32-wasi\debug\pulumi_rust_wasm.wasm" ".\target\wasm32-wasi\debug\pulumi-rust-wasm.wasm" || exit /b 1
+echo F|xcopy /b /v /y ".\target\wasm32-wasi\debug\pulumi_wasm_example_simple.wasm" ".\target\wasm32-wasi\debug\pulumi-wasm-example-simple.wasm" || exit /b 1
+echo F|xcopy /b /v /y ".\target\wasm32-wasi\debug\pulumi_wasm_provider_random.wasm" ".\target\wasm32-wasi\debug\pulumi-wasm-provider-random.wasm" || exit /b 1
 @REM
-@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi-wasm-main.wasm
-@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi-wasm-random.wasm
+@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi-wasm-example-simple.wasm
+@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi-wasm-provider-random.wasm
 @REM
-wasm-tools compose -o target/wasm32-wasi/debug/composed1.wasm target/wasm32-wasi/debug/pulumi-wasm-main.wasm -d target/wasm32-wasi/debug/pulumi-wasm-random.wasm || exit /b 1
+wasm-tools compose -o target/wasm32-wasi/debug/composed1.wasm target/wasm32-wasi/debug/pulumi-wasm-example-simple.wasm -d target/wasm32-wasi/debug/pulumi-wasm-provider-random.wasm || exit /b 1
 wasm-tools compose -o target/wasm32-wasi/debug/composed2.wasm target/wasm32-wasi/debug/composed1.wasm -d target/wasm32-wasi/debug/pulumi-wasm.wasm || exit /b 1
-cargo run -- compile --wasm target/wasm32-wasi/debug/composed2.wasm --output target/wasm32-wasi/debug/composed2.cwasm || exit /b 1
-wasmtime compile -D debug-info=y,coredump=y,address-map=y -o target/wasm32-wasi/debug/composed2.cwasm target/wasm32-wasi/debug/composed2.wasm || exit /b 1
+@REM cargo run -p pulumi_wasm_runner -- compile --wasm target/wasm32-wasi/debug/composed2.wasm --output target/wasm32-wasi/debug/composed2.cwasm || exit /b 1
+@REM wasmtime compile -D debug-info=y,coredump=y,address-map=y -o target/wasm32-wasi/debug/composed2.cwasm target/wasm32-wasi/debug/composed2.wasm || exit /b 1
 @REM
 @REM cargo build -p pulumi_entrypoint || exit /b
 @REM
-@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi-wasm-random.wasm
-@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi-wasm-main.wasm
+@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi-wasm-provider-random.wasm
+@REM @REM wasm-tools component wit target/wasm32-wasi/debug/pulumi-wasm-example-simple.wasm
 @REM
 @REM wasm-tools component wit target/wasm32-wasi/debug/composed1.wasm
 @REM wasm-tools component wit target/wasm32-wasi/debug/composed2.wasm

diff --git a/run.sh b/run.sh
@@ -4,21 +4,19 @@ set -e
 
 cargo component build -p wasm_common
 cargo component build -p pulumi_wasm
-cargo component build -p pulumi_wasm_random
-cargo component build -p pulumi_rust_wasm
-cargo component build -p pulumi_wasm_main
+cargo component build -p pulumi_wasm_provider_random
+cargo component build -p pulumi_wasm_example_simple
 cargo build
 
 
 cp "target/wasm32-wasi/debug/pulumi_wasm.wasm" "target/wasm32-wasi/debug/pulumi-wasm.wasm"
-cp "target/wasm32-wasi/debug/pulumi_wasm_main.wasm" "target/wasm32-wasi/debug/pulumi-wasm-main.wasm"
-cp "target/wasm32-wasi/debug/pulumi_wasm_random.wasm" "target/wasm32-wasi/debug/pulumi-wasm-random.wasm"
-cp "target/wasm32-wasi/debug/pulumi_rust_wasm.wasm" "target/wasm32-wasi/debug/pulumi-rust-wasm.wasm"
+cp "target/wasm32-wasi/debug/pulumi_wasm_example_simple.wasm" "target/wasm32-wasi/debug/pulumi-wasm-example-simple.wasm"
+cp "target/wasm32-wasi/debug/pulumi_wasm_provider_random.wasm" "target/wasm32-wasi/debug/pulumi-wasm-provider-random.wasm"
 
 
-wasm-tools compose -o target/wasm32-wasi/debug/composed1.wasm target/wasm32-wasi/debug/pulumi-wasm-main.wasm -d target/wasm32-wasi/debug/pulumi-wasm-random.wasm
+wasm-tools compose -o target/wasm32-wasi/debug/composed1.wasm target/wasm32-wasi/debug/pulumi-wasm-example-simple.wasm -d target/wasm32-wasi/debug/pulumi-wasm-provider-random.wasm
 wasm-tools compose -o target/wasm32-wasi/debug/composed2.wasm target/wasm32-wasi/debug/composed1.wasm -d target/wasm32-wasi/debug/pulumi-wasm.wasm
-cargo run -- compile --wasm target/wasm32-wasi/debug/composed2.wasm --output target/wasm32-wasi/debug/composed2.cwasm
+#cargo run -p pulumi_wasm_runner -- compile --wasm target/wasm32-wasi/debug/composed2.wasm --output target/wasm32-wasi/debug/composed2.cwasm
 #wasmtime compile -D debug-info=y,coredump=y,address-map=y -o target/wasm32-wasi/debug/composed2.cwasm target/wasm32-wasi/debug/composed2.wasm || exit /b 1
 
 wasm-tools component wit target/wasm32-wasi/debug/composed2.wasm

diff --git a/src/lib.rs b/src/lib.rs
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		@REM cargo run -- run --wasm target/wasm32-wasi/debug/composed2.wasm

		.\run.bat && cargo run -- run --wasm target/wasm32-wasi/debug/composed2.wasm
		.\run.bat && cargo run -p pulumi_wasm_runner -- run --wasm target/wasm32-wasi/debug/composed2.wasm
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ set -e

		./run.sh

		cargo run -- run --wasm target/wasm32-wasi/debug/composed2.wasm
		cargo run -p pulumi_wasm_runner -- run --wasm target/wasm32-wasi/debug/composed2.wasm