Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add defaultProvider as default credentialsProvider in services
  • Loading branch information
Schwusch committed Feb 20, 2022
commit 3eb796d06ea8cf95d279de0430d85f59e38d8f18
6 changes: 5 additions & 1 deletion all_apis/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@ environment:
dependencies:
shared_aws_api:
path: ../shared_aws_api
aws_credential_providers:
path: ../aws_credential_providers

dev_dependencies:
test: ^1.16.8


dependency_overrides:
shared_aws_api:
path: ../shared_aws_api
5 changes: 5 additions & 0 deletions generator/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,22 @@ awsSdkJsReference: v2.821.0
protocols:
ec2:
shared: ^1.0.0
credentialProviders: ^0.0.2
json:
shared: ^1.2.0
credentialProviders: ^0.0.2
publish: true
query:
shared: ^1.2.0
credentialProviders: ^0.0.2
publish: true
rest-json:
shared: ^1.2.0
credentialProviders: ^0.0.2
publish: true
rest-xml:
shared: ^1.2.0
credentialProviders: ^0.0.2
publish: true

# Packages to generate
Expand Down
1 change: 1 addition & 0 deletions generator/lib/builders/library_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ String buildService(Api api) {
import 'dart:convert';
import 'dart:typed_data';

import 'package:aws_credential_providers/aws_credential_providers.dart';
import 'package:shared_aws_api/shared.dart' as _s;
import 'package:shared_aws_api/shared.dart'
show rfc822ToJson, iso8601ToJson, unixTimestampToJson, nonNullableTimeStampFromJson, timeStampFromJson;
Expand Down
2 changes: 1 addition & 1 deletion generator/lib/builders/protocols/json_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class JsonServiceBuilder extends ServiceBuilder {
${api.metadata.className}({
${isRegionRequired ? 'required String' : 'String?'} region,
_s.AwsClientCredentials? credentials,
_s.AwsClientCredentialsProvider? credentialsProvider,
_s.AwsClientCredentialsProvider? credentialsProvider = defaultProvider,
_s.Client? client, String? endpointUrl,
})
: _protocol = _s.JsonProtocol(
Expand Down
2 changes: 1 addition & 1 deletion generator/lib/builders/protocols/query_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class QueryServiceBuilder extends ServiceBuilder {
${api.metadata.className}({
${isRegionRequired ? 'required String' : 'String?'} region,
_s.AwsClientCredentials? credentials,
_s.AwsClientCredentialsProvider? credentialsProvider,
_s.AwsClientCredentialsProvider? credentialsProvider = defaultProvider,
_s.Client? client,
})
: _protocol = _s.QueryProtocol(
Expand Down
2 changes: 1 addition & 1 deletion generator/lib/builders/protocols/rest_json_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class RestJsonServiceBuilder extends ServiceBuilder {
${api.metadata.className}({
${isRegionRequired ? 'required String' : 'String?'} region,
_s.AwsClientCredentials? credentials,
_s.AwsClientCredentialsProvider? credentialsProvider,
_s.AwsClientCredentialsProvider? credentialsProvider = defaultProvider,
_s.Client? client,
String? endpointUrl,
})
Expand Down
2 changes: 1 addition & 1 deletion generator/lib/builders/protocols/rest_xml_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class RestXmlServiceBuilder extends ServiceBuilder {
${api.metadata.className}({
${isRegionRequired ? 'required String' : 'String?'} region,
_s.AwsClientCredentials? credentials,
_s.AwsClientCredentialsProvider? credentialsProvider,
_s.AwsClientCredentialsProvider? credentialsProvider = defaultProvider,
_s.Client? client,
String? endpointUrl,
})
Expand Down
1 change: 1 addition & 0 deletions generator/lib/builders/pubspec_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ environment:

dependencies:
shared_aws_api: ${protocolConfig.shared}
aws_credential_providers: ${protocolConfig.credentialProviders}

$dependenciesOverride
''';
Expand Down
2 changes: 2 additions & 0 deletions generator/lib/model/config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@ class Config {
@JsonSerializable(createToJson: false, disallowUnrecognizedKeys: true)
class ProtocolConfig {
final String shared;
final String credentialProviders;

@JsonKey(defaultValue: false)
final bool publish;

ProtocolConfig({
required this.shared,
required this.publish,
required this.credentialProviders,
});

factory ProtocolConfig.fromJson(Map<String, dynamic> json) =>
Expand Down
3 changes: 2 additions & 1 deletion generator/lib/model/config.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions shared_aws_api/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ dependencies:
dev_dependencies:
pedantic: ^1.11.0
test: ^1.16.8
aws_credential_providers:
path: ../aws_credential_providers