new_cfoundry 4.9.2 → 4.9.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/VERSION +1 -1
  3. data/lib/cfoundry/baseclient.rb +4 -2
  4. data/lib/cfoundry/uaaclient.rb +7 -2
  5. metadata +102 -102
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 81542bb7be0c44a2809b3db5d62828116960a12d
4
- data.tar.gz: 6930795ec6e5eb197885b9f8b63e24760734289a
3
+ metadata.gz: 1c0e14e6bdd7e3d6c1da62176c9d47247948473e
4
+ data.tar.gz: e7a0167d50fa5151e304d745f1ab14cb90f11260
5
5
  SHA512:
6
- metadata.gz: f7cc869bc3e0cfc11794135895231ddca169fcff29454f6c2605ab7d582b6398f4ed8bd6ee9b4ed803e4210544e102096feef7f26b285436b8cfc28939df528a
7
- data.tar.gz: e20f1c87f7d070f8ecf2ddee408ec5f2a82ae8b1c73d52f76ca67ce909346bceb5b73f1553ca62f8eeb30a8e07b514173375befc002910c3040860b9ba15b880
6
+ metadata.gz: a12866b27203014effbdf3f321ab4d6e22850d0d4b3318b4183a833bc7219360073e216d1c11b447018e19486004395e98ff9cc11bfd70646d308b085ac40a83
7
+ data.tar.gz: 61d81d1ce8ff7a2f80ec5a19201d0727cb6f75c1d54769a9f43f931c6a4b8cdac97670c0983fadbefdb88f2ab3447e60483bbcc72dfe65bf9422ab99d3595c77
data/VERSION CHANGED
@@ -1 +1 @@
1
- 4.9.2
1
+ 4.9.3
data/lib/cfoundry/baseclient.rb CHANGED
@@ -12,7 +12,7 @@ module CFoundry
12
12
  extend Forwardable
13
13
 
14
14
  attr_reader :rest_client
15
- attr_accessor :client_id, :client_secret
15
+ attr_accessor :client_id, :client_secret, :skip_ssl_validation
16
16
 
17
17
  def_delegators :rest_client, :target, :target=, :token,
18
18
  :trace, :backtrace, :backtrace=, :log, :log=
@@ -21,6 +21,7 @@ module CFoundry
21
21
  @rest_client = CFoundry::RestClient.new(target, token)
22
22
  self.client_id = options[:client_id]
23
23
  self.client_secret = options[:client_secret]
24
+ self.skip_ssl_validation = options[:skip_ssl_validation]
24
25
  self.trace = false
25
26
  self.backtrace = false
26
27
  self.log = false
@@ -33,7 +34,8 @@ module CFoundry
33
34
  if endpoint
34
35
  uaa = CFoundry::UAAClient.new(endpoint,
35
36
  client_id || "cf",
36
- client_secret: client_secret)
37
+ client_secret: client_secret,
38
+ skip_ssl_validation: skip_ssl_validation)
37
39
  uaa.trace = trace
38
40
  uaa.token = token
39
41
  uaa
data/lib/cfoundry/uaaclient.rb CHANGED
@@ -9,6 +9,7 @@ module CFoundry
9
9
  @target = target
10
10
  @client_id = client_id
11
11
  @client_secret = options[:client_secret]
12
+ @skip_ssl_validation = options[:skip_ssl_validation]
12
13
  @uaa_info_client = uaa_info_client_for(target)
13
14
  end
14
15
 
@@ -93,11 +94,15 @@ module CFoundry
93
94
  private
94
95
 
95
96
  def uaa_info_client_for(url)
96
- CF::UAA::Info.new(url, :symbolize_keys => true)
97
+ options = { :symbolize_keys => true }
98
+ options[:skip_ssl_validation] = @skip_ssl_validation if @skip_ssl_validation
99
+ CF::UAA::Info.new(url, options)
97
100
  end
98
101
 
99
102
  def token_issuer
100
- @token_issuer ||= CF::UAA::TokenIssuer.new(target, client_id, client_secret, :symbolize_keys => true)
103
+ options = { :symbolize_keys => true }
104
+ options[:skip_ssl_validation] = @skip_ssl_validation if @skip_ssl_validation
105
+ @token_issuer ||= CF::UAA::TokenIssuer.new(target, client_id, client_secret, options)
101
106
  @token_issuer.logger.level = @trace ? Logger::Severity::TRACE : 1
102
107
  @token_issuer
103
108
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: new_cfoundry
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.9.2
4
+ version: 4.9.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - CI-Platform-Team
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2017-09-28 00:00:00.000000000 Z
12
+ date: 2017-12-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activemodel
@@ -589,125 +589,125 @@ specification_version: 4
589
589
  summary: High-level library for working with the Cloud Foundry API. This is fork from
590
590
  https://github.com/cloudfoundry-attic/cfoundry
591
591
  test_files:
592
- - spec/spec_helper.rb
593
- - spec/cfoundry/validator_spec.rb
594
- - spec/cfoundry/upload_helpers_spec.rb
595
- - spec/cfoundry/errors_spec.rb
592
+ - spec/cc_api_stub/app_usage_events_spec.rb
593
+ - spec/cc_api_stub/applications_spec.rb
594
+ - spec/cc_api_stub/domains_spec.rb
595
+ - spec/cc_api_stub/events_spec.rb
596
+ - spec/cc_api_stub/frameworks_spec.rb
597
+ - spec/cc_api_stub/login_spec.rb
598
+ - spec/cc_api_stub/organization_users_spec.rb
599
+ - spec/cc_api_stub/organizations_spec.rb
600
+ - spec/cc_api_stub/routes_spec.rb
601
+ - spec/cc_api_stub/runtimes_spec.rb
602
+ - spec/cc_api_stub/service_bindings_spec.rb
603
+ - spec/cc_api_stub/service_instances_spec.rb
604
+ - spec/cc_api_stub/services_spec.rb
605
+ - spec/cc_api_stub/space_users_spec.rb
606
+ - spec/cc_api_stub/spaces_spec.rb
607
+ - spec/cc_api_stub/users_spec.rb
608
+ - spec/cfoundry/auth_token_spec.rb
609
+ - spec/cfoundry/baseclient_spec.rb
596
610
  - spec/cfoundry/client_spec.rb
611
+ - spec/cfoundry/errors_spec.rb
612
+ - spec/cfoundry/rest_client_spec.rb
613
+ - spec/cfoundry/trace_helpers_spec.rb
597
614
  - spec/cfoundry/uaaclient_spec.rb
598
- - spec/cfoundry/v2/domain_spec.rb
599
- - spec/cfoundry/v2/model_spec.rb
600
- - spec/cfoundry/v2/organization_spec.rb
601
- - spec/cfoundry/v2/app_usage_event_spec.rb
615
+ - spec/cfoundry/upload_helpers_spec.rb
616
+ - spec/cfoundry/v2/app_event_spec.rb
602
617
  - spec/cfoundry/v2/app_instance_spec.rb
603
- - spec/cfoundry/v2/quota_definition_spec.rb
604
- - spec/cfoundry/v2/service_plan_spec.rb
605
- - spec/cfoundry/v2/model_magic_spec.rb
606
- - spec/cfoundry/v2/user_provided_service_instance_spec.rb
607
618
  - spec/cfoundry/v2/app_spec.rb
619
+ - spec/cfoundry/v2/app_usage_event_spec.rb
608
620
  - spec/cfoundry/v2/base_spec.rb
609
- - spec/cfoundry/v2/route_spec.rb
610
621
  - spec/cfoundry/v2/client_spec.rb
611
- - spec/cfoundry/v2/user_spec.rb
622
+ - spec/cfoundry/v2/domain_spec.rb
623
+ - spec/cfoundry/v2/event_spec.rb
624
+ - spec/cfoundry/v2/managed_service_instance_spec.rb
625
+ - spec/cfoundry/v2/model_magic/attribute_spec.rb
612
626
  - spec/cfoundry/v2/model_magic/has_summary_spec.rb
613
627
  - spec/cfoundry/v2/model_magic/to_many_spec.rb
614
- - spec/cfoundry/v2/model_magic/attribute_spec.rb
615
628
  - spec/cfoundry/v2/model_magic/to_one_spec.rb
616
- - spec/cfoundry/v2/event_spec.rb
617
- - spec/cfoundry/v2/managed_service_instance_spec.rb
618
- - spec/cfoundry/v2/app_event_spec.rb
619
- - spec/cfoundry/v2/space_spec.rb
629
+ - spec/cfoundry/v2/model_magic_spec.rb
630
+ - spec/cfoundry/v2/model_spec.rb
631
+ - spec/cfoundry/v2/organization_spec.rb
632
+ - spec/cfoundry/v2/quota_definition_spec.rb
633
+ - spec/cfoundry/v2/route_spec.rb
634
+ - spec/cfoundry/v2/service_plan_spec.rb
620
635
  - spec/cfoundry/v2/service_spec.rb
621
- - spec/cfoundry/trace_helpers_spec.rb
622
- - spec/cfoundry/baseclient_spec.rb
623
- - spec/cfoundry/rest_client_spec.rb
624
- - spec/cfoundry/auth_token_spec.rb
625
- - spec/integration/client_spec.rb
626
- - spec/fixtures/fake_cc_frameworks.json
636
+ - spec/cfoundry/v2/space_spec.rb
637
+ - spec/cfoundry/v2/user_provided_service_instance_spec.rb
638
+ - spec/cfoundry/v2/user_spec.rb
639
+ - spec/cfoundry/validator_spec.rb
640
+ - spec/factories/app_events_factory.rb
641
+ - spec/factories/app_usage_events_factory.rb
642
+ - spec/factories/apps_factory.rb
643
+ - spec/factories/clients_factory.rb
644
+ - spec/factories/domains_factory.rb
645
+ - spec/factories/events_factory.rb
646
+ - spec/factories/organizations_factory.rb
647
+ - spec/factories/quota_definitions_factory.rb
648
+ - spec/factories/routes_factory.rb
649
+ - spec/factories/service_instances_factory.rb
650
+ - spec/factories/service_plans_factory.rb
651
+ - spec/factories/services_factory.rb
652
+ - spec/factories/spaces_factory.rb
653
+ - spec/factories/user_provided_service_instances_factory.rb
654
+ - spec/factories/users_factory.rb
655
+ - spec/fixtures/apps/with_cfignore/ambiguous_ignored
656
+ - spec/fixtures/apps/with_cfignore/ignored_dir/file_in_ignored_dir.txt
657
+ - spec/fixtures/apps/with_cfignore/ignored_file.txt
658
+ - spec/fixtures/apps/with_cfignore/non_ignored_dir/file_in_non_ignored_dir.txt
659
+ - spec/fixtures/apps/with_cfignore/non_ignored_dir/ignored_file.txt
660
+ - spec/fixtures/apps/with_cfignore/non_ignored_dir/toplevel_ignored.txt
661
+ - spec/fixtures/apps/with_cfignore/non_ignored_file.txt
662
+ - spec/fixtures/apps/with_cfignore/toplevel_ignored.txt
663
+ - spec/fixtures/apps/with_dotfiles/xyz
664
+ - spec/fixtures/apps/with_external_symlink/foo
665
+ - spec/fixtures/apps/with_ignored_external_symlink/foo
666
+ - spec/fixtures/apps/with_nested_directories/foo/bar/baz/fizz
667
+ - spec/fixtures/apps/with_nested_directories/xyz
668
+ - spec/fixtures/empty_file
627
669
  - spec/fixtures/fake_cc_app_usage_events.json
628
- - spec/fixtures/fake_cc_service_bindings.json
629
- - spec/fixtures/fake_cc_runtimes.json
630
- - spec/fixtures/fake_cc_space_apps.json
631
- - spec/fixtures/fake_cc_managed_service_instance.json
632
- - spec/fixtures/fake_cc_space_summary.json
633
- - spec/fixtures/fake_cc_user_provided_service_instance.json
634
- - spec/fixtures/fake_cc_service_instance.json
635
- - spec/fixtures/fake_cc_created_space.json
636
- - spec/fixtures/fake_cc_empty_search.json
670
+ - spec/fixtures/fake_cc_application.json
671
+ - spec/fixtures/fake_cc_application_summary.json
672
+ - spec/fixtures/fake_cc_created_application.json
673
+ - spec/fixtures/fake_cc_created_domain.json
637
674
  - spec/fixtures/fake_cc_created_organization.json
638
- - spec/fixtures/fake_cc_organization_spaces.json
639
- - spec/fixtures/fake_cc_stats.json
640
- - spec/fixtures/fake_cc_user.json
641
- - spec/fixtures/fake_cc_organization_users.json
642
- - spec/fixtures/fake_cc_spaces.json
643
- - spec/fixtures/fake_cc_domain.json
644
- - spec/fixtures/fake_cc_events.json
675
+ - spec/fixtures/fake_cc_created_route.json
645
676
  - spec/fixtures/fake_cc_created_service_instance.json
646
- - spec/fixtures/fake_cc_application.json
647
- - spec/fixtures/empty_file
677
+ - spec/fixtures/fake_cc_created_space.json
648
678
  - spec/fixtures/fake_cc_created_user.json
649
- - spec/fixtures/fake_cc_user_organizations.json
650
- - spec/fixtures/fake_cc_organization_summary.json
679
+ - spec/fixtures/fake_cc_domain.json
680
+ - spec/fixtures/fake_cc_domain_spaces.json
681
+ - spec/fixtures/fake_cc_empty_search.json
682
+ - spec/fixtures/fake_cc_events.json
683
+ - spec/fixtures/fake_cc_frameworks.json
684
+ - spec/fixtures/fake_cc_managed_service_instance.json
685
+ - spec/fixtures/fake_cc_organization.json
651
686
  - spec/fixtures/fake_cc_organization_domains.json
687
+ - spec/fixtures/fake_cc_organization_search.json
688
+ - spec/fixtures/fake_cc_organization_spaces.json
689
+ - spec/fixtures/fake_cc_organization_summary.json
690
+ - spec/fixtures/fake_cc_organization_users.json
652
691
  - spec/fixtures/fake_cc_route.json
653
- - spec/fixtures/fake_cc_organization.json
654
- - spec/fixtures/fake_cc_created_route.json
692
+ - spec/fixtures/fake_cc_runtimes.json
655
693
  - spec/fixtures/fake_cc_service_binding.json
694
+ - spec/fixtures/fake_cc_service_bindings.json
695
+ - spec/fixtures/fake_cc_service_instance.json
656
696
  - spec/fixtures/fake_cc_service_instances.json
657
697
  - spec/fixtures/fake_cc_services.json
658
- - spec/fixtures/fake_cc_created_domain.json
659
- - spec/fixtures/fake_cc_domain_spaces.json
660
- - spec/fixtures/fake_cc_user_with_managers.json
661
- - spec/fixtures/fake_cc_organization_search.json
662
- - spec/fixtures/fake_cc_created_application.json
663
698
  - spec/fixtures/fake_cc_space.json
664
- - spec/fixtures/fake_cc_application_summary.json
665
- - spec/fixtures/apps/with_dotfiles/xyz
666
- - spec/fixtures/apps/with_cfignore/non_ignored_file.txt
667
- - spec/fixtures/apps/with_cfignore/ignored_dir/file_in_ignored_dir.txt
668
- - spec/fixtures/apps/with_cfignore/ignored_file.txt
669
- - spec/fixtures/apps/with_cfignore/non_ignored_dir/file_in_non_ignored_dir.txt
670
- - spec/fixtures/apps/with_cfignore/non_ignored_dir/ignored_file.txt
671
- - spec/fixtures/apps/with_cfignore/non_ignored_dir/toplevel_ignored.txt
672
- - spec/fixtures/apps/with_cfignore/toplevel_ignored.txt
673
- - spec/fixtures/apps/with_cfignore/ambiguous_ignored
674
- - spec/fixtures/apps/with_external_symlink/foo
675
- - spec/fixtures/apps/with_nested_directories/xyz
676
- - spec/fixtures/apps/with_nested_directories/foo/bar/baz/fizz
677
- - spec/fixtures/apps/with_ignored_external_symlink/foo
678
- - spec/factories/organizations_factory.rb
679
- - spec/factories/user_provided_service_instances_factory.rb
680
- - spec/factories/app_events_factory.rb
681
- - spec/factories/domains_factory.rb
682
- - spec/factories/routes_factory.rb
683
- - spec/factories/service_instances_factory.rb
684
- - spec/factories/app_usage_events_factory.rb
685
- - spec/factories/service_plans_factory.rb
686
- - spec/factories/users_factory.rb
687
- - spec/factories/apps_factory.rb
688
- - spec/factories/services_factory.rb
689
- - spec/factories/clients_factory.rb
690
- - spec/factories/events_factory.rb
691
- - spec/factories/quota_definitions_factory.rb
692
- - spec/factories/spaces_factory.rb
693
- - spec/cc_api_stub/frameworks_spec.rb
694
- - spec/cc_api_stub/runtimes_spec.rb
695
- - spec/cc_api_stub/domains_spec.rb
696
- - spec/cc_api_stub/applications_spec.rb
697
- - spec/cc_api_stub/spaces_spec.rb
698
- - spec/cc_api_stub/events_spec.rb
699
- - spec/cc_api_stub/routes_spec.rb
700
- - spec/cc_api_stub/service_bindings_spec.rb
701
- - spec/cc_api_stub/services_spec.rb
702
- - spec/cc_api_stub/users_spec.rb
703
- - spec/cc_api_stub/service_instances_spec.rb
704
- - spec/cc_api_stub/app_usage_events_spec.rb
705
- - spec/cc_api_stub/space_users_spec.rb
706
- - spec/cc_api_stub/login_spec.rb
707
- - spec/cc_api_stub/organization_users_spec.rb
708
- - spec/cc_api_stub/organizations_spec.rb
709
- - spec/support/test_model_builder.rb
710
- - spec/support/shared_examples/model_summary_examples.rb
699
+ - spec/fixtures/fake_cc_space_apps.json
700
+ - spec/fixtures/fake_cc_space_summary.json
701
+ - spec/fixtures/fake_cc_spaces.json
702
+ - spec/fixtures/fake_cc_stats.json
703
+ - spec/fixtures/fake_cc_user.json
704
+ - spec/fixtures/fake_cc_user_organizations.json
705
+ - spec/fixtures/fake_cc_user_provided_service_instance.json
706
+ - spec/fixtures/fake_cc_user_with_managers.json
707
+ - spec/integration/client_spec.rb
708
+ - spec/spec_helper.rb
709
+ - spec/support/factory_girl.rb
711
710
  - spec/support/shared_examples/cc_api_stub_request_examples.rb
712
711
  - spec/support/shared_examples/client_login_examples.rb
713
- - spec/support/factory_girl.rb
712
+ - spec/support/shared_examples/model_summary_examples.rb
713
+ - spec/support/test_model_builder.rb