Skip to content

Commit 30030dc

Browse files
committed
with_terraform instead generate_terraform
1 parent 50b037b commit 30030dc

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

lib/manifold/api/project.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ def workspaces
2222
@workspaces ||= workspace_directories.map { |dir| Workspace.from_directory(dir, logger:) }
2323
end
2424

25-
def generate(generate_terraform: false)
26-
workspaces.each { |w| w.generate(generate_terraform:) }
27-
generate_terraform_entrypoint if generate_terraform
25+
def generate(with_terraform: false)
26+
workspaces.each { |w| w.generate(with_terraform:) }
27+
generate_terraform_entrypoint if with_terraform
2828
end
2929

3030
def workspaces_directory

lib/manifold/api/workspace.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ def add
2626
FileUtils.cp(template_path, manifold_path)
2727
end
2828

29-
def generate(generate_terraform: false)
29+
def generate(with_terraform: false)
3030
return unless manifold_exists? && any_vectors?
3131

3232
generate_dimensions
33-
do_generate_terraform if generate_terraform
33+
generate_terraform if with_terraform
3434
logger.info("Generated BigQuery dimensions table schema for workspace '#{name}'.")
3535
end
3636

@@ -101,7 +101,7 @@ def vectors
101101
manifold_yaml["vectors"]
102102
end
103103

104-
def do_generate_terraform
104+
def generate_terraform
105105
config = Terraform::WorkspaceConfiguration.new(name)
106106
config.write(terraform_main_path)
107107
end

lib/manifold/cli.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def generate
5151
path = Pathname.pwd
5252
name = path.basename.to_s
5353
project = API::Project.new(name, directory: path, logger:)
54-
project.generate(generate_terraform: options[:tf])
54+
project.generate(with_terraform: options[:tf])
5555
logger.info "Generated BigQuery schema for all workspaces in the project."
5656
end
5757
end

spec/manifold/api/project_spec.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,21 @@
6060
end
6161
end
6262

63-
context "with generate_terraform: false" do
63+
context "with with_terraform: false" do
6464
it "does not generate terraform configurations" do
65-
project.generate(generate_terraform: false)
65+
project.generate(with_terraform: false)
6666
expect(project.directory.join("main.tf.json")).not_to be_file
6767
end
6868
end
6969

70-
context "with generate_terraform: true" do
70+
context "with with_terraform: true" do
7171
it "creates a terraform configuration file" do
72-
project.generate(generate_terraform: true)
72+
project.generate(with_terraform: true)
7373
expect(project.directory.join("main.tf.json")).to be_file
7474
end
7575

7676
it "includes workspace modules in the terraform configuration" do
77-
project.generate(generate_terraform: true)
77+
project.generate(with_terraform: true)
7878
config = parse_terraform_config(project)
7979
expect(config["module"]).to include(expected_workspace_modules)
8080
end

spec/manifold/cli_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,25 @@
4444

4545
context "when called with --tf option" do
4646
before do
47-
allow(mock_project).to receive(:generate).with(generate_terraform: true)
47+
allow(mock_project).to receive(:generate).with(with_terraform: true)
4848
end
4949

5050
it "generates terraform configurations" do
5151
cli.options = { tf: true }
5252
cli.generate
53-
expect(mock_project).to have_received(:generate).with(generate_terraform: true)
53+
expect(mock_project).to have_received(:generate).with(with_terraform: true)
5454
end
5555
end
5656

5757
context "when called without --tf option" do
5858
before do
59-
allow(mock_project).to receive(:generate).with(generate_terraform: false)
59+
allow(mock_project).to receive(:generate).with(with_terraform: false)
6060
end
6161

6262
it "does not generate terraform configurations" do
6363
cli.options = { tf: false }
6464
cli.generate
65-
expect(mock_project).to have_received(:generate).with(generate_terraform: false)
65+
expect(mock_project).to have_received(:generate).with(with_terraform: false)
6666
end
6767
end
6868
end

0 commit comments

Comments
 (0)