Skip to content

clean up manifest generation, and a couple other things #100

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
Closed
wants to merge 1 commit into from
Closed

clean up manifest generation, and a couple other things #100

wants to merge 1 commit into from

Conversation

@Amit-PivotalLabs
Copy link

@Amit-PivotalLabs Amit-PivotalLabs commented Nov 11, 2015

This mostly introduces the following changes to manifest-generation

  • the bottom part of config-from-cf-internal.yml is only responsible for pulling data from the CF manifest, and defaults to nil if and only if it's possible for that data is not provided in the CF manifest.
  • the top part of config-from-cf-internal.yml transforms the extracted data into data diego's manifest needs
  • config-from-cf.yml is now only for masking off unneeded values from config-from-cf-internal
  • diego.yml now only directly consumes values from the result of config-from-cf.yml, and does do any more transformation, with the sole exception of the deployment name being the CF name plus "-diego".

Additionally, this:

  • deletes the unused etcd.machines property
  • adds the consul.datacenter property
  • removes stubs-for-cf-release/enable_consul_with_cf.yml which has long been redundant

I tried to validate this by generating a BOSH-Lite diego manifest before and after the changes, the only difference was the addition of the consul.datacenter: null value, as expected. I didn't try it against other environments (ketchup, A1, etc.) but that would be easy enough to do.

NB: This builds on #97, please make sure @cholick gets credit for the idea via the git committer/author should you decide to merge this PR.

@cfdreddbot
Copy link

cfdreddbot commented Nov 11, 2015

Hey Amit-PivotalLabs!

Thanks for submitting this pull request! I'm here to inform the recipients of the pull request that you've already signed the CLA.

1 similar comment
@cfdreddbot
Copy link

cfdreddbot commented Nov 11, 2015

Hey Amit-PivotalLabs!

Thanks for submitting this pull request! I'm here to inform the recipients of the pull request that you've already signed the CLA.

@cf-gitbot
Copy link

cf-gitbot commented Nov 11, 2015

We have created an issue in Pivotal Tracker to manage this. You can view the current status of your issue at: https://www.pivotaltracker.com/story/show/107887880.

@jfmyers9
Copy link
Contributor

jfmyers9 commented Nov 11, 2015

Merged as of fc7b3ac.

@jfmyers9 jfmyers9 closed this Nov 11, 2015
jvshahid added a commit that referenced this pull request Jun 18, 2018
@jvshahid
bump diego-ssh uaa-go-client jwt-go
4081347 
[finishes #155485548](https://www.pivotaltracker.com/story/show/155485548)

Submodule src/code.cloudfoundry.org/diego-ssh 9b3f460..1174556:
  > Upgrade jwt-go library.
Submodule src/code.cloudfoundry.org/uaa-go-client 0c176509..26b271e3:
  > Ignore validation error when token used before issued
  > go back to using submodules from routing-release
  > Provide correct url
  > Update README
  > all tests passing with newer JWT
  > fixing vet errors
  > Merge pull request #10 from cloudfoundry-incubator/vendor-deps
  > Revert "remove incubator"
  > remove incubator
Submodule src/github.com/dgrijalva/jwt-go f62f64ea..06ea1031:
  > documentation around expected key types
  > Merge branch 'master' of github.com:dgrijalva/jwt-go
  > add options to ParseFromRequest
  > fixed a formatting error in a test
  > documenting changes for upcoming 3.2.0 release
  > Merge pull request #152 from pusher/parse-unverified
  > Merge pull request #219 from geertjanvdk/feat/parse
  > Merge pull request #205 from zamicol/icon_godoc
  > Merge pull request #209 from zhyuri/patch-1
  > Merge pull request #220 from polarina/readme-alt-include
  > Notice about upcoming 4.0.0 release
  > 3.1.0 changelog
  > Merge pull request #218 from zoofood/patch-1
  > updated note on alg type vulnerability
  > Merge pull request #183 from hnakamur/support_rs256_in_jwt_command
  > Merge pull request #196 from dgrijalva/dg/cmd_args
  > Merge pull request #190 from jamesrwhite/patch-1
  > Merge pull request #180 from kevinburke/fix-unreachable
  > Merge pull request #166 from johnlockwood-wf/issue-165-missing-arg
  > Merge pull request #151 from zaichang/FixMigrationGuide
  > Merge pull request #146 from pkieltyka/master
  > Merge pull request #140 from kazhuravlev/patch-1
  > Merge pull request #77 from dgrijalva/release_3_0_0
  > v2.7.0
  > notice about imminent 3.0.0
  > Merge pull request #136 from bruston/keyfunc-typo
  > fixes #135 copy/paste error in rsa decoding tools
  > Merge pull request #132 from abourget/master
  > Merge pull request #133 from johnlockwood-wf/expire-delta
  > release notes
  > expose inner error within ValidationError
  > Merge branch 'master' of https://github.com/emanoelxavier/jwt-go-contr into dg/merge_112
  > cleaned up style and added tests
  > Merge branch 'master' of https://github.com/dakom/jwt-go into dg/pr_121
  > version history update
  > Merge pull request #79 from dgrijalva/dg/none
  > Merge pull request #122 from appleboy/patch-1
  > add 1.6 to travis.yml
  > Merge pull request #107 from Snorlock/bearer-verification
  > Merge pull request #111 from matm/master
  > added supported signing methods
  > Added some clarification and (hopefully) helpful documentation
  > version history
  > signature should be populated after parsing a valid token
  > Merge pull request #98 from dgrijalva/dg/parser
  > use cleaner version of prefix checking (thanks shurcooL)
  > fix array OOB panic (#100)
  > Merge pull request #93 from EnerfisTeam/master
  > Merge branch 'master' of github.com:dgrijalva/jwt-go
  > minor refactor of HMAC verify for legibility.  no functional changes
  > updated documenation of SigningMethod interface
tas-runtime-bot added a commit that referenced this pull request Jan 28, 2025
@tas-runtime-bot
bump bbs executor rep
010c2f3 
Submodule src/code.cloudfoundry.org/bbs ee93cf6..6e7e77d:
  > RFC-0030 Add support to Diego for file based service bindings  (#100)
Submodule src/code.cloudfoundry.org/executor 45c70e7..0399756:
  > RFC-0030 - Add support to Diego for file based service bindings  (#100)
Submodule src/code.cloudfoundry.org/rep a32720d..ccf3c92:
  > RFC-0030 - Add support to Diego for file based service bindings (#56)
kart2bc pushed a commit to kart2bc/diego-release that referenced this pull request Aug 19, 2025
@dimitardimitrov13
RFC-0030 Add support to Diego for file based service bindings (cloudf…
6e7e77d 
…oundry#100)

* Extend models and proto-buffers definitions for SERVICE_BINDING_ROOT.

* Add some PoC code within desired_lrp_db.go

* Add go.mod and go.sum for testing purpose.

* Add some PoC code within desired_lrp_db.go fix.

* Add some PoC code within desired_lrp_db.go debug.

* Implementing service binding root size validator

* Extend test scenario.

* Rename filesVariables to fileBasedServiceBinding and regenerating of proto buffers.

* Rename fileBasedServiceBinding to serviceBindingFiles.

* Adding of BDD tests for serviceBindingFiles.

* Remove go.mod and go.sum
Remove scripts/generate_go_protos.sh.
Restore models.go and remove PoC request.

* Unify protobuf defintion for Files in desired_lrp.proto

* Addressing all linter issues.

* Changes according Updates cloudfoundry#1008

* Re-generating of desired_lrp.pb.go after conflicts.

* Changes according to code review.
kart2bc pushed a commit to kart2bc/diego-release that referenced this pull request Aug 19, 2025
@ameowlia
Revert "RFC-0030 Add support to Diego for file based service bindings (…
053f2d6 
…cloudfoundry#100)"

This reverts commit 6e7e77d.
kart2bc pushed a commit to kart2bc/diego-release that referenced this pull request Aug 25, 2025
@dimitardimitrov13 @PlamenDoychev
RFC-0030 - Add support to Diego for file based service bindings (clou…
0399756 
…dfoundry#100)

* Adding of ServiceBindingRoot to executor config.

* Implement binding root for ServiceBindigRoot

* Implement the creation of service binding config files.

* Add go.mod and go.sum for testing purpose.

* Extend the creation of service binding config files.

* Implement container sercice binding root cleanup.

* Implementing BDD tests.

* Rename filesVariables to fileBasedServiceBinding.

* Rename fileBasedServiceBinding to serviceBindingFiles.

* Remove go.mod and go.sum
Remove ioutil.ReadFile in favor of os.ReadFile.
Remove MkdirAll in favor of Mkdir.

* Changes according Updates cloudfoundry#1008

* Change Mkdir to MkdirAll. Fixes around those changes. Refactoring of tests.

* Changes according to code review.

* Apply review feedback

* Apply review feedback

---------

Co-authored-by: i044263 <[email protected]>
kart2bc pushed a commit to kart2bc/diego-release that referenced this pull request Aug 25, 2025
@ameowlia
Revert "RFC-0030 - Add support to Diego for file based service bindin…
111288a 
…gs (cloudfoundry#100)"

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

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@Amit-PivotalLabs @cfdreddbot @cf-gitbot @jfmyers9 @amitkgupta