New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP - Fixing instance creation workflow #336

Merged

Temikus merged 4 commits into fog:master from Temikus:fix_workflow_5

May 20, 2018

Member

Temikus commented May 17, 2018

Added a quick helper to process tags the old-fashioned way,
as {:items => []} is harder to write
Added :zone_name alias in instances to match Disk model
Fixed create_instance example

Fixes #315

houndci-bot reviewed

View reviewed changes

lib/fog/compute/google/requests/insert_server.rb Outdated

-                          data[:tags] = ::Google::Apis::ComputeV1::Tags.new(options[:tags])
+                          if options[:tags].is_a?(Array)
+                            # Process classic tag notation, i.e. ["fog"]
+                            data[:tags] = ::Google::Apis::ComputeV1::Tags.new({:items => options[:tags]})

houndci-bot May 17, 2018

Layout/SpaceInsideHashLiteralBraces: Space inside { missing.
Style/BracesAroundHashParameters: Redundant curly braces around a hash parameter.
Layout/SpaceInsideHashLiteralBraces: Space inside } missing.

examples/create_instance.rb Outdated

                   :username => ENV["USER"],
                   :tags => ["fog"],
-                  :service_accounts => %w(sql-admin bigquery https://www.googleapis.com/auth/compute)
+                  :service_accounts => {:scopes => %w(sql-admin bigquery https://www.googleapis.com/auth/compute)}

houndci-bot May 17, 2018

Layout/SpaceInsideHashLiteralBraces: Space inside { missing.
Layout/SpaceInsideHashLiteralBraces: Space inside } missing.

Member Author

Temikus commented May 17, 2018

This is a reproposal after I accidentally pushed to master.

I'll be in my shame cube.

Temikus mentioned this pull request

unable to update the metadata instance on the cloud #329

Closed

Temikus changed the title ~~Updated example~~ Fixing instance creation workflow

Temikus changed the title ~~Fixing instance creation workflow~~ WIP - Fixing instance creation workflow

Temikus force-pushed the fix_workflow_5 branch from 7b08901 to 9672ffb Compare

May 18, 2018 09:26

houndci-bot reviewed

View reviewed changes

lib/fog/compute/google/models/server.rb Outdated

		@@ -350,15 +350,26 @@ def set_scheduling(async = true,
		reload
		end

houndci-bot May 18, 2018

Layout/EmptyLines: Extra blank line detected.

Member Author

Temikus commented May 18, 2018 •

edited

Loading

This should also fix #329

Only thing left to add is some tests, I don't want to chase this down again as the underlying metadata format errors are very unintuitive.

houndci-bot reviewed

View reviewed changes

test/integration/compute/test_servers.rb Outdated

+                  server.set_metadata({'foo' => 'bar', 'baz'=>'foo'}, false)
+                  assert_equal [{:key=>"foo", :value=>"bar"}, {:key=>"baz", :value=>"foo"}], server.metadata[:items]
+                end
+              end

houndci-bot May 19, 2018

Layout/TrailingBlankLines: Final newline missing.

test/integration/compute/test_servers.rb Outdated

+                  server = @factory.create
+                  server.wait_for { ready? }
+                  server.set_metadata({'foo' => 'bar', 'baz'=>'foo'}, false)
+                  assert_equal [{:key=>"foo", :value=>"bar"}, {:key=>"baz", :value=>"foo"}], server.metadata[:items]

houndci-bot May 19, 2018

Layout/SpaceInsideHashLiteralBraces: Space inside { missing.
Layout/SpaceAroundOperators: Surrounding space missing for operator =>.
Layout/SpaceInsideHashLiteralBraces: Space inside } missing.

test/integration/compute/test_servers.rb Outdated

+                def test_set_metadata
+                  server = @factory.create
+                  server.wait_for { ready? }
+                  server.set_metadata({'foo' => 'bar', 'baz'=>'foo'}, false)

houndci-bot May 19, 2018

Layout/SpaceInsideHashLiteralBraces: Space inside { missing.
Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.
Layout/SpaceAroundOperators: Surrounding space missing for operator =>.
Layout/SpaceInsideHashLiteralBraces: Space inside } missing.

houndci-bot reviewed

View reviewed changes

test/integration/compute/test_servers.rb Outdated

+                  server.set_metadata({'foo' => 'bar', 'baz'=>'foo'}, false)
+                  assert_equal [{:key=>"foo", :value=>"bar"}, {:key=>"baz", :value=>"foo"}], server.metadata[:items]
+                end
+              end

houndci-bot May 19, 2018

Layout/TrailingBlankLines: Final newline missing.

test/integration/compute/test_servers.rb Outdated

+                  server = @factory.create
+                  server.wait_for { ready? }
+                  server.set_metadata({'foo' => 'bar', 'baz'=>'foo'}, false)
+                  assert_equal [{:key=>"foo", :value=>"bar"}, {:key=>"baz", :value=>"foo"}], server.metadata[:items]

houndci-bot May 19, 2018

Layout/SpaceInsideHashLiteralBraces: Space inside { missing.
Layout/SpaceAroundOperators: Surrounding space missing for operator =>.
Layout/SpaceInsideHashLiteralBraces: Space inside } missing.

test/integration/compute/test_servers.rb Outdated

+                def test_set_metadata
+                  server = @factory.create
+                  server.wait_for { ready? }
+                  server.set_metadata({'foo' => 'bar', 'baz'=>'foo'}, false)

houndci-bot May 19, 2018

Layout/SpaceInsideHashLiteralBraces: Space inside { missing.
Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.
Layout/SpaceAroundOperators: Surrounding space missing for operator =>.
Layout/SpaceInsideHashLiteralBraces: Space inside } missing.

Temikus added 3 commits

May 19, 2018 20:20


          More fixes to instance creation workflow

d842d55

- Added a quick helper to process tags the old-fashioned way,
as {:items => []} is harder to write
- Added :zone_name alias in instances to match Disk model
- Fixed create_instance example

Fixes fog#315


          Update badges on README

6bcb34c


          Add byebug history to gitignore

db3e01f

Temikus force-pushed the fix_workflow_5 branch from 4d932c7 to 482f62c Compare

May 19, 2018 10:21

houndci-bot reviewed

View reviewed changes

test/integration/compute/test_servers.rb Outdated

+                def test_set_metadata
+                  server = @factory.create
+                  server.wait_for { ready? }
+                  server.set_metadata({ 'foo' => 'bar', 'baz' => 'foo' }, false)

houndci-bot May 19, 2018

Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

lib/fog/compute/google/models/server.rb Outdated

@@ @@ -349,16 +349,26 @@ def set_scheduling(async = true, @@
                         operation.wait_for { ready? } unless async
                         reload
                       end

houndci-bot May 19, 2018

Layout/TrailingWhitespace: Trailing whitespace detected.

Temikus force-pushed the fix_workflow_5 branch from a553508 to 5db3f59 Compare

May 19, 2018 10:24


          Fixing Server.set_metadata

2554ba0

- Fixes the set_metadata method and adopts a better format for it.
- This should not be a breaking change since the method appears to have never worked since 2.0 :(
- Adding a test for it so it gets caught by CI in the future

Fixes fog#329

Temikus force-pushed the fix_workflow_5 branch from 5db3f59 to 2554ba0 Compare

May 19, 2018 10:27

Temikus added the integrate label

Member Author

Temikus commented May 20, 2018

Integration tests pass \o/ I'm merging this.

Temikus merged commit 985cd02 into fog:master

Temikus deleted the fix_workflow_5 branch

June 22, 2018 00:06

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels