manifold-cli 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eb276f49eed54c682bf10a9edc53c567a4e61c1dc2c7ee1b27e98596c91d81f
-  data.tar.gz: 3e9374eeb7c36b5a5cd99b17a1d168b363ee161c23ffcae3ec54a170401ae34f
+  metadata.gz: fdae058a6565425aa19baae58b7da3b53894e796f80e2a4a71381e47f7efa5a4
+  data.tar.gz: c0098c7dab8c4289d7e4e5e5bc0eb9b2bc49941c527c2f51292351a347e76d84
 SHA512:
-  metadata.gz: d1760a9ee8d1f2a8c78521761168696e50d87d6ca1194feb68f6a4c8a552d112624ba9c5512226f042bacedee1ae490a55f2e8ec33179e2cc588e26eb8f8e302
-  data.tar.gz: 57ff9863d1ce37d21ac58cdc8b634449754106a2472a3d1bfbebd6332d302b1ec39377ffb5dad882091df5b500bbb654c0ea385e2a60190486f903701a4d8035
+  metadata.gz: fea29b28a3883eafd9b96fa8a84a3be0472671185323c6e12e88986a442084311f725f65559f504c62d0324be21ee868d87dc0415f6bcb55de17fbd755a66915
+  data.tar.gz: 78d64517a90ec5a6911807fa7b439930b2712362c173a31c463084ad1f2048571a6ca1e0d402fb899d418ada6e71e2f34cf56ab31c4e93e906f0b2ddb95b03fe

data/README.md

@@ -69,16 +69,20 @@ manifold generate
 Manifold can optionally generate Terraform configurations for managing your BigQuery resources. To generate both BigQuery schemas and Terraform configurations, use the `--tf` flag:
 
 ```bash
+# Generate standard Terraform configuration
 manifold generate --tf
+
+# Generate Terraform configuration as a submodule (skips provider configuration)
+manifold generate --tf --submodule
 ```
 
 This will create:
 
-- A root `main.tf.json` file that sets up the Google Cloud provider and workspace modules
+- A root `main.tf.json` file that sets up the Google Cloud provider and workspace modules (unless using `--submodule`)
 - Individual workspace configurations in `workspaces/<workspace_name>/main.tf.json`
 - Dataset and table definitions that reference your generated BigQuery schemas
 
-The generated Terraform configurations use the Google Cloud provider and expect a `project_id` variable to be set. You can apply these configurations using standard Terraform commands:
+The generated Terraform configurations use the Google Cloud provider and expect a `project_id` variable to be set. When using the standard configuration (without `--submodule`), you can apply these configurations directly:
 
 ```bash
 terraform init
@@ -86,6 +90,15 @@ terraform plan -var="project_id=your-project-id"
 terraform apply -var="project_id=your-project-id"
 ```
 
+When using `--submodule`, the generated configuration skips provider setup, allowing you to include the project as a module in a larger Terraform configuration:
+
+```hcl
+module "my_manifold_project" {
+  source = "./path/to/manifold/project"
+  project_id = var.project_id
+}
+```
+
 ## Manifold Configuration
 
 ### Vectors

data/lib/manifold/api/project.rb

@@ -22,9 +22,9 @@ module Manifold
         @workspaces ||= workspace_directories.map { |dir| Workspace.from_directory(dir, logger:) }
       end
 
-      def generate(with_terraform: false)
+      def generate(with_terraform: false, is_submodule: false)
         workspaces.each { |w| w.generate(with_terraform:) }
-        generate_terraform_entrypoint if with_terraform
+        generate_terraform_entrypoint(is_submodule:) if with_terraform
       end
 
       def workspaces_directory
@@ -41,8 +41,8 @@ module Manifold
         workspaces_directory.children.select(&:directory?)
       end
 
-      def generate_terraform_entrypoint
-        config = Terraform::ProjectConfiguration.new(workspaces)
+      def generate_terraform_entrypoint(is_submodule: false)
+        config = Terraform::ProjectConfiguration.new(workspaces, skip_provider_config: is_submodule)
         config.write(directory.join("main.tf.json"))
       end
     end

data/lib/manifold/cli.rb

@@ -47,11 +47,13 @@ module Manifold
 
     desc "generate", "Generate BigQuery schema for all workspaces in the project"
     method_option :tf, type: :boolean, desc: "Generate Terraform configurations"
+    method_option :submodule, type: :boolean, default: false,
+                              desc: "Generate Terraform configurations as a submodule (skips provider configuration)"
     def generate
       path = Pathname.pwd
       name = path.basename.to_s
       project = API::Project.new(name, directory: path, logger:)
-      project.generate(with_terraform: options[:tf])
+      project.generate(with_terraform: options[:tf], is_submodule: options[:submodule])
       logger.info "Generated BigQuery schema for all workspaces in the project."
     end
   end

data/lib/manifold/terraform/project_configuration.rb

@@ -4,23 +4,29 @@ module Manifold
   module Terraform
     # Represents a Terraform configuration for a Manifold project.
     class ProjectConfiguration < Configuration
-      attr_reader :workspaces, :provider_version
+      attr_reader :workspaces, :provider_version, :skip_provider_config
 
       DEFAULT_TERRAFORM_GOOGLE_PROVIDER_VERSION = "6.18.1"
 
-      def initialize(workspaces, provider_version: DEFAULT_TERRAFORM_GOOGLE_PROVIDER_VERSION)
+      def initialize(workspaces, provider_version: DEFAULT_TERRAFORM_GOOGLE_PROVIDER_VERSION,
+                     skip_provider_config: false)
         super()
         @workspaces = workspaces
         @provider_version = provider_version
+        @skip_provider_config = skip_provider_config
       end
 
       def as_json
-        {
-          "terraform" => terraform_block,
-          "provider" => provider_block,
+        config = {}
+        unless skip_provider_config
+          config["terraform"] = terraform_block
+          config["provider"] = provider_block
+        end
+
+        config.merge!(
           "variable" => variables_block,
           "module" => workspace_modules
-        }
+        )
       end
 
       private

data/lib/manifold/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Manifold
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: manifold-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - claytongentry
 bindir: bin
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 2025-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor