Skip to content

Conversation

@davidjahn
Copy link
Contributor

This is required to enable SSL cert verification with custom CA certs. Currently custom certificates do not work in Windows cells because of the missing line this PR adds.

* This is required to enable SSL cert verification with custom CA certs

[#137990067]

Signed-off-by: David Jahn <[email protected]>
@cfdreddbot
Copy link

Hey davidjahn!

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

@cf-gitbot
Copy link

We have created an issue in Pivotal Tracker to manage this:

https://www.pivotaltracker.com/story/show/139050443

The labels on this github issue will be updated when the story is started.

@emalm
Copy link
Contributor

emalm commented Feb 3, 2017

Thanks, @davidjahn! Do the certificates work with the two-space indentation on line 2 of jobs/rep_windows/templates/ca_certs_for_downloads.crt.erb (which I realize you likely copied from https://github.com/cloudfoundry/diego-release/blob/develop/jobs/rep/templates/ca_certs_for_downloads.crt.erb)? We had an issue (#259) recently with that same indentation in https://github.com/cloudfoundry/diego-release/blob/develop/jobs/rep/templates/ca_certs_for_downloads.crt.erb.

In any case, we can check and fix that as part of pulling this in.

Thanks,
Eric

@nimakaviani nimakaviani merged commit 1a38fa6 into cloudfoundry:develop Feb 3, 2017
jvshahid added a commit that referenced this pull request Jun 5, 2018
Submodule src/code.cloudfoundry.org/executor 23ff7f3..08a81a5:
  > use the new gomega Receive matcher to cleanup the tests
Submodule src/github.com/onsi/ginkgo 67b9df7f5..c73579c58:
  > Increase eventually timeout to 30s
  > Clarify asynchronous test behaviour
  > Travis badge should only show master
  > v1.5.0
  > Bring the changelog up to date (#470)
  > Merge pull request #466 from onsi/issue-464
  > Merge pull request #468 from onsi/update-changelog
  > Merge pull request #459 from onsi/unfocus-exclude-vendor
  > Merge pull request #456 from idoru/ignore-suite-with-ignored-go-files
  > Merge pull request #455 from onsi/flaky-measurements
  > Merge pull request #423 from alamages/coverage-tests-fix
  > Add go 1.10 to travis
  > Merge pull request #448 from melnikk/master
  > Merge pull request #451 from onsi/go-1.10-coverage-test
  > Merge pull request #446 from onsi/do-not-create-outputdir
  > Add an extra new line after reporting spec run completion
  > Merge pull request #441 from blgm/releasing
  > Merge pull request #443 from onsi/add-go-1.10
  > Merge pull request #438 from onsi/issue-436
  > Merge pull request #434 from mezis/blur-specify
  > Merge pull request #430 from onsi/issue-426
  > Add tests for When/Specify
  > Update comments and README.md for `When` DSL
  > Merge pull request #386 from akshaymankar/when
  > Merge pull request #383 from eloycoto/master
  > fix the tests on go versions <1.9
  > add a test case for #415
  > Fix Ginkgo stack trace on failure for Specify
  > Merge pull request #409 from lflux/readme-update
  > Merge pull request #400 from alex-slynko/patch-1
  > Merge pull request #403 from alex-slynko/fix_govet
  > Merge pull request #404 from lflux/travis-go-1.9
  > Merge pull request #399 from alex-slynko/fix_imports
  > Merge pull request #401 from alex-slynko/patch-2
  > Merge pull request #398 from martinxsliu/generated-import-ordering
  > Merge pull request #390 from DennisDenuto/master
  > Re-add noisySkippings flag
  > Replace GOPATH in Environment
  > Allow coverage to be displayed for focused specs (#367)
  > ensure customer reporters are run before default reporter
  > Handle -outputdir flag (#364)
  > Handle -coverprofile flag (#355)
  > v1.4.0
  > v1.4.0
  > fix CONTRIBUTING.md
  > Add a CONTRIBUTING.md file
  > add -timeout flag.  fixes #248
  > add 'requireSuite' flag to cause failure if there are test files but no suite (#359)
  > update changelog
  > emit compilation output
  > link to vscode extension
  > add ginkgo watch -watchRegExp fixes #356
  > remove fixCompilationOutput  (fixes #357)
  > Remove mailing list
  > Add Rick and Morty quote to untilItFails messages (#354)
  > Revert "Fix wrong repo URL (#351)" (#352)
  > Fix wrong repo URL (#351)
  > Lack of test suites no longer breaks builds (#347)
  > Update CHANGELOG.md
  > Warn when a suite has test files but no tests to run (#345)
  > fix flaky test by, you know, not relying on obscure go internals
  > update .travis.yml to get latest patch releases
  > fix failing go 1.5 tests
  > ensure tests pass on Go 1.8.1
  > v1.3.1: Actually change the CLI version
  > print location of test suite that failed to report back (#339)
  > v1.3.0
Submodule src/github.com/onsi/gomega 777f4d387..41673fd8f:
  > allow 'Receive' matcher to be used with concrete types (#286)
  > Fix data race in ghttp server (#283)
  > Travis badge should only show master
  > v1.4.0
  > Update the CHANGELOG.md with all changes since last release
  > Improve message from AssignableToTypeOf when expected value is nil (#281)
  > Merge pull request #278 from benmoss/master
  > Merge pull request #273 from vayan/master
  > change Ω to Expect in most places (#268)
  > Merge pull request #272 from trayo/master
  > Merge pull request #271 from onsi/add-go-1.10
  > Merge pull request #270 from Patagonicus/master
  > Remove tests that tried to verify signals as async
  > Merge pull request #262 from onsi/issue-173
  > Merge pull request #259 from onsi/issue-258
  > v1.3.0
  > Add more robust support for XUnit style tests
  > Merge pull request #256 from onsi/allow-multiple-go-routines
  > Merge pull request #253 from challiwill/master
  > Merge pull request #249 from alex-slynko/fix_govet
  > Merge pull request #247 from alex-slynko/fix_imports
  > Merge pull request #243 from williammartin/find-first-mismatch-oob
  > Merge pull request #241 from ivy/fix-typos
  > Merge pull request #218 from alex-slynko/patch-1
  > Merge pull request #239 from williammartin/parallel-testing
  > Merge pull request #235 from onsi/fix-227
  > MatchXML should ignore the order of xml node attributes
  > Merge pull request #233 from kaedys/bugfix/error-matcher-fix
  > Uses equality matcher for matching error strings

Signed-off-by: Sunjay Bhatia <[email protected]>
tas-runtime-bot added a commit that referenced this pull request Sep 18, 2024
…inigo garden grootfs guardian

Submodule src/code.cloudfoundry.org/bbs 9be69c0..4b574f9:
  > Fix file/dir creation permissions
Submodule src/code.cloudfoundry.org/buildpackapplifecycle ced564efa..888a70480:
  > Fix file/dir creation permissions
Submodule src/code.cloudfoundry.org/cacheddownloader 09b8631e3..a52cc2a85:
  > Ignore G110 for app asset decompression as it's bounded by container FS quota (#38)
  > Fix file/dir creation permissions
Submodule src/code.cloudfoundry.org/credhub-cli fd43d7668..17db04838:
  > Bump go modules
Submodule src/code.cloudfoundry.org/executor 0a01dbe..a8f0e01:
  > Ignore G110 for app asset decompression as it's bounded by container FS quota (#104)
  > Fix file/dir creation permissions
Submodule src/code.cloudfoundry.org/inigo 18074ea..3d1daff:
  > Fix file/dir creation permissions
Submodule src/garden fba22f3dc..4995881dc:
  > Merge pull request #120 from cloudfoundry/g306-fix
Submodule src/grootfs 430f6acc1..1fe4dd327:
  > Merge pull request #268 from cloudfoundry/fix-g110
  > Merge pull request #267 from cloudfoundry/g306-fix
Submodule src/guardian 87e1e97ab..cd421f913:
  > Merge pull request #451 from cloudfoundry/g306-fix
tas-runtime-bot added a commit that referenced this pull request Sep 19, 2024
…ocket rep route-emitter routing-api vizzini garden grootfs

Submodule src/code.cloudfoundry.org/auctioneer 50f383d3a..127aac4 (rewind):
  < Updates to match new locket protobufs
  < Struct changes due to new protobuf
Submodule src/code.cloudfoundry.org/bbs a8b71a568..4b574f9 (rewind):
  < Updates to match new locket protobufs
  < Regenerate protos with latest protoc
  < Merge branch 'main' into protobuf-with-plugin
  < Update to use new locket protobufs
  < Change to match new protobufs
  < Regenerate all other protos
  < Resolve merge conflicts. Regenerate desired_lrp.proto
  < Remove debug log statements
  < Change interface{} to explicit type so we can use ToProto() and send to newTestRequest
  < We can use d.Routes directly here since it's a pointer
  < Replace eventfakes with new FakeEvent object
  < Make FakeEvent a proper proto object Regenerate protos
  < Routable is a pointer and needs to be dereferenced
  < Need to store the deserializeModel result in a variable to use later
  < Change responses to use pointers so we can use them after the method calls
  < Lint ignore for unnecessary nil check Change routes to use pointers
  < Ginkgo unfocus + lint ignore for deprecated method testing
  < WIP: Make integration tests use new protobuf
  < Struct and naming convention changes; Trueing up lint deprecation
  < Regenerate protos with deprecated markers
  < Added support for deprecated things to be marked as such in the output files
  < Struct and naming changes due to new protobuf
  < Struct and naming changes due to new protobuf
  < Merge branch 'main' into protobuf-with-plugin
  < Naming convention change due to new protobuf
  < Updated loggregator to v9
  < expectedEvent doesn't need to be converted to a Proto here
  < Add conversions for protobuf messages
  < Add ToEventProto for models.Event interface
  < Replace gogo protobuf with google protobuf
  < Use google.golang protobuf instead of gogo protobuf Remove Unmarshal from MessageValidator interface (use proto.Marshal instead)
  < Structure and naming changes due to Protobuf upgrades
  < Add Validate functions for Proto structs
  < Have to use Proto structs (.ToProto()) in proto.Marshal
  < Naming convention changes due to protobuf updates
  < Have to pass a Proto struct in order to populate correctly, then use FromProto for the return value
  < Naming convention changes due to protobuf updates
  < Remove usage of protojson, encoding/json package is enough for our use case
  < copy() is destination first
  < Regenerate protos with improved optional support and AlwaysEmit changes
  < Protos: Add AlwaysEmit options to Messages to match old protobuf results
  < Codegen: Handle optional fields better: Make sure we're checking for nils Set default values where appropriate When a Map has a value of Message type, dereference for Equal
  < Codegen: Action no longer needs special Get/SetValue in accessors
  < Codegen: alwaysEmit->jsonEmit
  < Add JsonAlwaysEmit and CustomType features; Regenerate protos for codegen
  < Redirect output from pushd/popd to /dev/null
  < WIP: What if Routes wasn't a special case?
  < Add explicit json_name for static and dynamic
  < Codegen: Remove extra log messages, use Desc.Name() for ignoredMessages
  < Update Task test for protobuf and protojson changes
  < Regenerate protos for json_name changes
  < Add json_names for fields with underscores
  < Update SecurityGroups test for protobuf and protojson changes
  < Regenerate protos for Action special case
  < Add special case for Action types (they need GetValue and SetValue)
  < Add ExcludeFromEqual to Error.Message; regenerate error.proto
  < Codegen: Add support for ExcludeFromEqual feature and regenerate codegen protos
  < Update tests to account for protojson and protobuf changes
  < Add GetProto for Actions so we can marshal/unmarshal correctly
  < Regenerate actions.proto for json_name changes
  < Add json_name tags to prevent camelCase from happening
  < Use protojson for Marshal/Unmarshal functionality
  < Update pointers to reflect new ByValue types
  < Regenerate protos with new ByValue types
  < Add ByValue attributes to match old protobuf declarations
  < Codegen: Don't generate a Getter for By Value types
  < Regenerate protos for nil checks on ProtoSlice/ProtoMap methods and bbs_by_value support
  < Pointer changes / Proto conversion for Routes bbs_by_value
  < Add nil checks on ToProto/FromProto Custom Routes type requires json.RawMessage but we only have []byte, so conversion has to be done manually
  < Make custom Routes type use bbs_by_value
  < Codegen: Add nil checks for ProtoSlice and ProtoMap methods
  < Codegen: Add support for bbs_by_value
  < Codegen: Regenerate bbs.proto for bbs_by_value support
  < Codegen: Add bbs_by_value option (allows fields to be passed by value instead of reference)
  < Use generate_protos script
  < Update generate_protos script to handle plugin
  < Regenerate protos with nil checks for ToProto and From Proto
  < CodeGen: add nil checks for ToProto and FromProto methods
  < Extract structs into variables and use ToProto to give back a proto.Message
  < Add ToEventProto to Event interface and use it for Un/Marshalling
  < Remove old gogoproto generated files
  < Use copy instead of loop (staticcheck compliance)
  < Test changes to reflect proto and model changes
  < Add FromProto to Routes special case
  < Regenerate protos with new Slice/Map methods and FromProto methods
  < Differentiate between Slices and Maps Add FromProto methods
  < Bring back old functionality after ignoring ProtoRoutes/Routes in our protoc plugin
  < Regenerate desired_lrp proto (ignore ProtoRoutes in favor of routes.go)
  < Handles Routes special case for Equal
  < Regenerate protos (was using RC release) Make bbs.pb.go a full file (try to resolve this later)
  < Revert package change and remove softlinks
  < Change package of protogen plugin to models and softlink .proto and .pb.go files into models Always ignore bbs.proto when generating our plugin's files
  < Weird Routes issue (assume because we aren't using the one defined in routes.go any more)
  < Standardization of enum value names (include containing struct)
  < Standardization of enum value names (include containing struct)
  < Lack of protobuf embed support requires using the structs directly
  < Pointer changes due to standard protobuf updates
  < Standardization of ActualLRP=>ActualLrp
  < Remove gogoproto proto.Message
  < Standardization of DesiredLRP=>DesiredLrp
  < Lack of protobuf embed support requires using the structs directly
  < Pointer changes due to standard protobuf updates
  < Regenerate protos for maps with a value type of protogen message
  < Fix type on enumvalue_customname
  < Don't need Proto prefix for string types
  < Add support for map values with a protogen'd message type Add ProtoMap function for conversion between our map and the default protogen map
  < Default value for repeated fields (arrays/slices) is nil
  < Use type name instead of field name when generating an enum cast
  < Pointer changes due to optional field support
  < Field name standardization on ActualLrp*
  < Pointer changes due to optional field support
  < Regenerate protos with standardized LRP fieldName modifications (i.e. no modifications from standard protoc output)
  < Remove getFieldName overrides for Actual/DesiredLRP. This wasn't consistent so we're going to standardize on the output from basic protoc (ActualLrp instead of ActualLRP)
  < Regenerate protos after ToProto field name fix
  < Incorrect field name used when generating ToProto function
  < Regenerate protos after oneof removal
  < Remove support for oneof since we weren't using it (previous use of oneof was incorrect and essentially a non-use of oneof)
  < Regenerate protos with optional field support
  < Add support for optional fields
  < Remove duplicate methods generated by plugin
  < Regenerate protos for Routable fix
  < These Routables aren't messages, so don't need the 'Proto' prefix
  < CellId exists on ActualLRPInstanceKey. Golang protobuf doesn't support embedded types, so we need to reference this directly. Potential NRE if ActualLRPInstanceKey is null, but this function doesn't look like it's being used.
  < Regenerate protos with getFieldName overrides for Actual/DesiredLRP
  < Add getFieldName func: For adding additional logic to generated field name (e.g. ActualLrp => ActualLRP) This is intended to be reverted after confirming bbs still works after the plugin is finished. It's here now because we want to make as few changes to the bbs code as possible.
  < Regenerate protos with Equal function
  < No longer ignoring ProtoRoutes
  < Add Equal function for struct generation
  < Regenerate protos with Enum String func
  < Add String function to enum generation Remove unnecessary check on len(msg.Enums)
  < Regenerate protos with enum name/value maps
  < Add name/value maps to enum generation
  < Remove duplicate methods generated by our protoc plugin
  < Remove duplicate methods generated by our protoc plugin
  < Remove duplicate methods generated by our protoc plugin
  < Remove gogoproto proto.Message from ActionInterface
  < Remove duplicate methods generated by our protoc plugin
  < Regenerate protos with accessors
  < Import bbs.proto for enum customname extension
  < Support generating accessors (Get/Set) Rearrange some code for scope changes
  < Regenerate protos with new plugin
  < Make use of enumvalue_customvalue extension Remove extra Proto for ProtoRoutes
  < Move bbs.proto to protoc plugin folder
  < Add new protoc plugin for bbs code generation
  < WIP: proto changes
  < WIP: New protoc plugin for BBS
  < Move gogoproto files to their own directory
  < Protos: Change oneof optionals to actual optionals (oneofs weren't being used correctly)
  < Protos: omitempty no longer needed (protobuf always adds it)
  < Protos: Change option go_package to code.cloudfoundry.org/bbs/models
  < Protos: Move optional to beginning of line Remove json_name definitions where not needed
  < Protos: Remove gogoproto.equal_all
  < Protos: Remove string_name from enums (does not work)
  < Protos: Remove gogoproto.goproto_enum_prefix_all
  < Protos: gogoproto.enumvalue_customname => string_name
  < Protos: Remove gogoproto.customtype
  < Protos: Remove gogoproto.embed
  < Protos: Remove gogoproto.nullable false (required fields are not valid in protobuf3)
  < Protos: gogoproto.nullable true => optional
  < Protos: gogoproto.jsontag => json_name
  < Protos: Add option go_package
  < Protos: Remove import of gogoproto
  < Preserve gogoproto generated files
Submodule src/code.cloudfoundry.org/cacheddownloader 59cf13f5f..a52cc2a85:
  > Ignore G110 for app asset decompression as it's bounded by container FS quota (#38)
Submodule src/code.cloudfoundry.org/cfdot ddd347fb9..864c4a6 (rewind):
  < Updates to match new locket protobufs
  < Update to use new protobufs
Submodule src/code.cloudfoundry.org/diego-ssh e4ae099fb..0e1b7b1 (rewind):
  < Merge branch 'main' into protobuf-with-plugin
  < Update to use the latest protobufs
Submodule src/code.cloudfoundry.org/executor e44c63e96...a8f0e01a6:
  > Ignore G110 for app asset decompression as it's bounded by container FS quota (#104)
  < Remove reference to gogo/protobuf
  > Fix file/dir creation permissions
  < Resolve merge conflict: Change ShouldNot(Receive()) to Should(Receive(&nilOjbect))
  < Merge main into protobuf-with-plugin
  < Change Should.Receive(nil) to ShouldNot(Receive()) since Gomega requires a pointer and this should be equivalent
  < Resolve staticcheck issues with Errorf and testing deprecated functionality
  < SetNofile and SetNproc take pointers now due to protobuf changes
Submodule src/code.cloudfoundry.org/inigo 121564129...3d1daff34:
  > Fix file/dir creation permissions
  < Merge branch 'main' into protobuf-with-plugin
  < Update struct references to match new protobufs
Submodule src/code.cloudfoundry.org/locket 05fc38ac4..b344fdd15 (rewind):
  < Regenerate protos with latest protoc
  < Regenerate proto with linter
  < Update references to new protos
  < Remove gogo/protobuf in favor of golang/protobuf; Regenerate protos
Submodule src/code.cloudfoundry.org/rep 57b907171..057388d (rewind):
  < Updates to match new locket protobufs
  < Resolve merge conflict: Change ShouldNot(Receive()) to Should(Receive(&nilOjbect))
  < Protobuf change after merge
  < Merge main into protobuf-with-plugin
  < Change Should.Receive(nil) to ShouldNot(Receive()) since Gomega requires a pointer and this should be equivalent
  < Struct changes due to new protobuf
Submodule src/code.cloudfoundry.org/route-emitter a465116f5..1ed8242 (rewind):
  < Updates to match new locket protobufs
  < Resolve merge conflict: Add additional ports for TLS
  < Instances has to be set explicitly to 0 since it's a pointer now
  < Update to use new protobufs
Submodule src/code.cloudfoundry.org/routing-api 604e3808a..2aa4a71d2 (rewind):
  < Updates to match new locket protobufs
Submodule src/code.cloudfoundry.org/vizzini 14b91b0b1..56193ba (rewind):
  < Update to use new protobufs
  < Update struct references to match new protobufs
Submodule src/garden fba22f3dc..4995881dc:
  > Merge pull request #120 from cloudfoundry/g306-fix
Submodule src/grootfs 430f6acc1..ba459651c:
  > Update go.mod dependencies
  > Merge pull request #268 from cloudfoundry/fix-g110
  > Merge pull request #267 from cloudfoundry/g306-fix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants