Skip to content

Commit 37a9ea3

Browse files
authored
Move SSOOIDC gem into core (#2745)
1 parent 7777427 commit 37a9ea3

File tree

23 files changed

+90
-105
lines changed

23 files changed

+90
-105
lines changed

build_tools/aws-sdk-code-generator/lib/aws-sdk-code-generator/code_builder.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def source_files(options = {})
5959
y.yield("#{prefix}/plugins/apig_endpoint.rb", apig_endpoint_class)
6060
end
6161
y.yield("#{prefix}.rb", service_module(prefix))
62-
unless %w[aws-sdk-sts aws-sdk-sso].include? prefix
62+
unless %w[aws-sdk-sts aws-sdk-sso aws-sdk-ssooidc].include? prefix
6363
y.yield("#{prefix}/customizations.rb", '')
6464
end
6565
y.yield("#{prefix}/types.rb", types_module)

build_tools/aws-sdk-code-generator/lib/aws-sdk-code-generator/views/service_module.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def requires
5656
# This is required to support backwards compatibility for SSO which was
5757
# moved from the aws-sdk-sso gem into aws-sdk-core.
5858
def require_core_guard?
59-
name == 'SSO' || name == 'STS'
59+
name == 'SSO' || name == 'STS' || name == 'SSOOIDC'
6060
end
6161

6262
# @return [Array<String>]

build_tools/services.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def plugin_path(plugin_name)
112112
end
113113

114114
gems_dir = File.expand_path('../../gems', __FILE__)
115-
prefix = %w[sts sso].include?(gem) ? ["#{gems_dir}/aws-sdk-core/lib/aws-sdk-#{gem}"] :
115+
prefix = %w[sts sso ssooidc].include?(gem) ? ["#{gems_dir}/aws-sdk-core/lib/aws-sdk-#{gem}"] :
116116
["#{gems_dir}/aws-sdk-#{gem}/lib/aws-sdk-#{gem}"]
117117
(prefix + parts).join('/') + '.rb'
118118
end

doc-src/templates/default/fulldoc/html/setup.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def class_list_children(children, tree, options = {})
4343
out << linkify(child, name)
4444
out << " &lt; #{child.superclass.name}" if child.is_a?(CodeObjects::ClassObject) && child.superclass
4545
if child.group == 'service'
46-
if name.downcase == :sts || name.downcase == :sso
46+
if name.downcase == :sts || name.downcase == :sso || name.downcase == :ssooidc
4747
out << " (aws-sdk-core)"
4848
else
4949
out << " (aws-sdk-#{name.downcase})"

gems/aws-sdk-core/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Unreleased Changes
22
------------------
33

4+
* Feature - Moved functionality from `aws-sdk-ssoidc` into core.
5+
46
3.132.0 (2022-08-08)
57
------------------
68

gems/aws-sdk-core/lib/aws-sdk-core.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999

100100
# aws-sdk-sso is included to support Aws::SSOCredentials
101101
require_relative 'aws-sdk-sso'
102+
require_relative 'aws-sdk-ssooidc'
102103

103104
module Aws
104105

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# frozen_string_literal: true
2+
3+
# WARNING ABOUT GENERATED CODE
4+
#
5+
# This file is generated. See the contributing guide for more information:
6+
# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
7+
#
8+
# WARNING ABOUT GENERATED CODE
9+
10+
11+
unless Module.const_defined?(:Aws)
12+
require 'aws-sdk-core'
13+
require 'aws-sigv4'
14+
end
15+
16+
require_relative 'aws-sdk-ssooidc/types'
17+
require_relative 'aws-sdk-ssooidc/client_api'
18+
require_relative 'aws-sdk-ssooidc/client'
19+
require_relative 'aws-sdk-ssooidc/errors'
20+
require_relative 'aws-sdk-ssooidc/resource'
21+
require_relative 'aws-sdk-ssooidc/customizations'
22+
23+
# This module provides support for AWS SSO OIDC. This module is available in the
24+
# `aws-sdk-core` gem.
25+
#
26+
# # Client
27+
#
28+
# The {Client} class provides one method for each API operation. Operation
29+
# methods each accept a hash of request parameters and return a response
30+
# structure.
31+
#
32+
# ssooidc = Aws::SSOOIDC::Client.new
33+
# resp = ssooidc.create_token(params)
34+
#
35+
# See {Client} for more information.
36+
#
37+
# # Errors
38+
#
39+
# Errors returned from AWS SSO OIDC are defined in the
40+
# {Errors} module and all extend {Errors::ServiceError}.
41+
#
42+
# begin
43+
# # do stuff
44+
# rescue Aws::SSOOIDC::Errors::ServiceError
45+
# # rescues all AWS SSO OIDC API errors
46+
# end
47+
#
48+
# See {Errors} for more information.
49+
#
50+
# @!group service
51+
module Aws::SSOOIDC
52+
53+
GEM_VERSION = '3.132.0'
54+
55+
end

gems/aws-sdk-ssooidc/lib/aws-sdk-ssooidc/client.rb renamed to gems/aws-sdk-core/lib/aws-sdk-ssooidc/client.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,8 +564,8 @@ def build_request(operation_name, params = {})
564564
client: self,
565565
params: params,
566566
config: config)
567-
context[:gem_name] = 'aws-sdk-ssooidc'
568-
context[:gem_version] = '1.20.0'
567+
context[:gem_name] = 'aws-sdk-core'
568+
context[:gem_version] = '3.132.0'
569569
Seahorse::Client::Request.new(handlers, context)
570570
end
571571

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# frozen_string_literal: true

0 commit comments

Comments
 (0)