File tree Expand file tree Collapse file tree 5 files changed +16
-16
lines changed Expand file tree Collapse file tree 5 files changed +16
-16
lines changed Original file line number Diff line number Diff line change @@ -22,9 +22,9 @@ def workspaces
22
22
@workspaces ||= workspace_directories . map { |dir | Workspace . from_directory ( dir , logger :) }
23
23
end
24
24
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
28
28
end
29
29
30
30
def workspaces_directory
Original file line number Diff line number Diff line change @@ -26,11 +26,11 @@ def add
26
26
FileUtils . cp ( template_path , manifold_path )
27
27
end
28
28
29
- def generate ( generate_terraform : false )
29
+ def generate ( with_terraform : false )
30
30
return unless manifold_exists? && any_vectors?
31
31
32
32
generate_dimensions
33
- do_generate_terraform if generate_terraform
33
+ generate_terraform if with_terraform
34
34
logger . info ( "Generated BigQuery dimensions table schema for workspace '#{ name } '." )
35
35
end
36
36
@@ -101,7 +101,7 @@ def vectors
101
101
manifold_yaml [ "vectors" ]
102
102
end
103
103
104
- def do_generate_terraform
104
+ def generate_terraform
105
105
config = Terraform ::WorkspaceConfiguration . new ( name )
106
106
config . write ( terraform_main_path )
107
107
end
Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ def generate
51
51
path = Pathname . pwd
52
52
name = path . basename . to_s
53
53
project = API ::Project . new ( name , directory : path , logger :)
54
- project . generate ( generate_terraform : options [ :tf ] )
54
+ project . generate ( with_terraform : options [ :tf ] )
55
55
logger . info "Generated BigQuery schema for all workspaces in the project."
56
56
end
57
57
end
Original file line number Diff line number Diff line change 60
60
end
61
61
end
62
62
63
- context "with generate_terraform : false" do
63
+ context "with with_terraform : false" do
64
64
it "does not generate terraform configurations" do
65
- project . generate ( generate_terraform : false )
65
+ project . generate ( with_terraform : false )
66
66
expect ( project . directory . join ( "main.tf.json" ) ) . not_to be_file
67
67
end
68
68
end
69
69
70
- context "with generate_terraform : true" do
70
+ context "with with_terraform : true" do
71
71
it "creates a terraform configuration file" do
72
- project . generate ( generate_terraform : true )
72
+ project . generate ( with_terraform : true )
73
73
expect ( project . directory . join ( "main.tf.json" ) ) . to be_file
74
74
end
75
75
76
76
it "includes workspace modules in the terraform configuration" do
77
- project . generate ( generate_terraform : true )
77
+ project . generate ( with_terraform : true )
78
78
config = parse_terraform_config ( project )
79
79
expect ( config [ "module" ] ) . to include ( expected_workspace_modules )
80
80
end
Original file line number Diff line number Diff line change 44
44
45
45
context "when called with --tf option" do
46
46
before do
47
- allow ( mock_project ) . to receive ( :generate ) . with ( generate_terraform : true )
47
+ allow ( mock_project ) . to receive ( :generate ) . with ( with_terraform : true )
48
48
end
49
49
50
50
it "generates terraform configurations" do
51
51
cli . options = { tf : true }
52
52
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 )
54
54
end
55
55
end
56
56
57
57
context "when called without --tf option" do
58
58
before do
59
- allow ( mock_project ) . to receive ( :generate ) . with ( generate_terraform : false )
59
+ allow ( mock_project ) . to receive ( :generate ) . with ( with_terraform : false )
60
60
end
61
61
62
62
it "does not generate terraform configurations" do
63
63
cli . options = { tf : false }
64
64
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 )
66
66
end
67
67
end
68
68
end
You can’t perform that action at this time.
0 commit comments