Skip to content

Fix conduct load creating empty bundle configuration#524

Merged
fsat merged 1 commit intotypesafehub:masterfrom
fsat:empty-config-fix
Jul 20, 2017
Merged

Fix conduct load creating empty bundle configuration#524
fsat merged 1 commit intotypesafehub:masterfrom
fsat:empty-config-fix

Conversation

@fsat
Copy link
Copy Markdown
Contributor

@fsat fsat commented Jul 20, 2017

When conduct load <bundle> is invoked, empty configuration is created.

Once the expected empty bndl argument for roles is updated from None to empty array within conduct load, the empty configuration is no longer created.

When `conduct load <bundle>` is invoked, empty configuration is created.

Once the expected empty `bndl` argument for `roles` is updated from `None` to empty array within `conduct load`, the empty configuration is no longer created.
@fsat
Copy link
Copy Markdown
Contributor Author

fsat commented Jul 20, 2017

Fixes #521

@fsat fsat changed the title Fix conduct load creating empty bundle configuration WIP - DON'T MERGE - Fix conduct load creating empty bundle configuration Jul 20, 2017
@fsat
Copy link
Copy Markdown
Contributor Author

fsat commented Jul 20, 2017

I will post manual test shortly.

@fsat
Copy link
Copy Markdown
Contributor Author

fsat commented Jul 20, 2017

Manual test is done successfully. Loading bundle no longer loads any config.

Start the sandbox.

Felixs-MBP-2:conductr-cli felixsatyaputra$ sandbox run 2.1.2 --no-default-features
|------------------------------------------------|
| Starting ConductR                              |
|------------------------------------------------|
Bintray credentials loaded from /Users/felixsatyaputra/.lightbend/commercial.credentials
Extracting ConductR core to /Users/felixsatyaputra/.conductr/images/core
Extracting ConductR agent to /Users/felixsatyaputra/.conductr/images/agent
Starting ConductR core instance on 192.168.10.1..
Waiting for ConductR to start..
Starting ConductR agent instance on 192.168.10.1..
|------------------------------------------------|
| OCI-in-Docker support unavailable.             |
|------------------------------------------------|
|------------------------------------------------|
| To provide support ensure Docker is running    |
| and restart the sandbox                        |
|------------------------------------------------|
|------------------------------------------------|
| Summary                                        |
|------------------------------------------------|
|- - - - - - - - - - - - - - - - - - - - - - - - |
| ConductR                                       |
|- - - - - - - - - - - - - - - - - - - - - - - - |
ConductR has been started:
  core instance on 192.168.10.1
  agent instance on 192.168.10.1
ConductR service locator has been started on:
  192.168.10.1:9008
|- - - - - - - - - - - - - - - - - - - - - - - - |
| Proxy                                          |
|- - - - - - - - - - - - - - - - - - - - - - - - |
HAProxy has not been started
To enable proxying ensure Docker is running and restart the sandbox
|- - - - - - - - - - - - - - - - - - - - - - - - |
| Bundles                                        |
|- - - - - - - - - - - - - - - - - - - - - - - - |
Check latest bundle status with:
  conduct info
Current bundle status:
Licensed To: cc64df31-ec6b-4e08-bb6b-3216721a56b@lightbend
Max ConductR agents: 10
ConductR Version(s): 0.1.0, 2.1.*
Grants: akka-sbr, cinnamon, conductr

ID  NAME  TAG  #REP  #STR  #RUN  ROLES

Warning: A newer ConductR version is available. Please upgrade the sandbox to 2.1.3 by running
Warning:   sandbox run 2.1.3

Load a bundle.

Felixs-MBP-2:conductr-cli felixsatyaputra$ conduct load continuous-delivery
Retrieving bundle..
Resolving bundle using [bintray_resolver, docker_resolver]
Loading bundle from cache typesafe/bundle/continuous-delivery
Bintray credentials loaded from /Users/felixsatyaputra/.lightbend/commercial.credentials
Retrieving from cache /Users/felixsatyaputra/.conductr/cache/bundle/continuous-delivery-2.1.0-870ee7d6a4f5853229275cca14b604b8aca62a5e74819c0a092858cc75b6c186.zip
Loading bundle to ConductR..
[##################################################] 100%
Bundle 870ee7d6a4f5853229275cca14b604b8 is installed
Bundle loaded.
Start bundle with:        conduct run 870ee7d
Unload bundle with:       conduct unload 870ee7d
Print ConductR info with: conduct info
Print bundle info with:   conduct info 870ee7d

Bundle is loaded without config.

Felixs-MBP-2:conductr-cli felixsatyaputra$ conduct info
Licensed To: cc64df31-ec6b-4e08-bb6b-3216721a56b@lightbend
Max ConductR agents: 10
ConductR Version(s): 0.1.0, 2.1.*
Grants: akka-sbr, cinnamon, conductr

ID       NAME                   TAG  #REP  #STR  #RUN  ROLES
870ee7d  continuous-delivery  2.1.0     1     0     0  continuous-delivery

@fsat fsat changed the title WIP - DON'T MERGE - Fix conduct load creating empty bundle configuration Fix conduct load creating empty bundle configuration Jul 20, 2017
@fsat fsat merged commit 032023a into typesafehub:master Jul 20, 2017
@fsat fsat deleted the empty-config-fix branch July 20, 2017 06:21
# evaluate to True. We check for an attribute that normally isn't present to detect this.
if hasattr(args, '_no_bndl_') and getattr(args, '_no_bndl_'):
return False

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks (and sorry) for fixing that mess! ;)

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants