Skip to content

Commit

Permalink
Fix repo org move issues (#3166)
Browse files Browse the repository at this point in the history
This PR fixes issues introduced by moving the repository from
awslabs/smithy-rs to smithy-lang/smithy-rs.

----

_By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice._
  • Loading branch information
jdisanti authored Nov 10, 2023
1 parent 7f8fef2 commit 6438a09
Show file tree
Hide file tree
Showing 245 changed files with 791 additions and 787 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-merge-queue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
needs:
- save-docker-login-token
- acquire-base-image
if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' || toJSON(github.event.merge_group) != '{}' }}
if: ${{ github.event.pull_request.head.repo.full_name == 'smithy-lang/smithy-rs' || toJSON(github.event.merge_group) != '{}' }}
uses: ./.github/workflows/ci.yml
with:
run_sdk_examples: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-pr-forks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
# it uploads the image as a build artifact for other jobs to download and use.
acquire-base-image:
name: Acquire Base Image
if: ${{ github.event.pull_request.head.repo.full_name != 'awslabs/smithy-rs' }}
if: ${{ github.event.pull_request.head.repo.full_name != 'smithy-lang/smithy-rs' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -39,7 +39,7 @@ jobs:
# Run shared CI after the Docker build image has either been rebuilt or found in ECR
ci:
needs: acquire-base-image
if: ${{ github.event.pull_request.head.repo.full_name != 'awslabs/smithy-rs' }}
if: ${{ github.event.pull_request.head.repo.full_name != 'smithy-lang/smithy-rs' }}
uses: ./.github/workflows/ci.yml
with:
run_sdk_examples: true
8 changes: 4 additions & 4 deletions .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
# The login password is encrypted with the repo secret DOCKER_LOGIN_TOKEN_PASSPHRASE
save-docker-login-token:
name: Save a docker login token
if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' }}
if: ${{ github.event.pull_request.head.repo.full_name == 'smithy-lang/smithy-rs' }}
outputs:
docker-login-password: ${{ steps.set-token.outputs.docker-login-password }}
permissions:
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
acquire-base-image:
name: Acquire Base Image
needs: save-docker-login-token
if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' }}
if: ${{ github.event.pull_request.head.repo.full_name == 'smithy-lang/smithy-rs' }}
runs-on: smithy_ubuntu-latest_8-core
env:
ENCRYPTED_DOCKER_PASSWORD: ${{ needs.save-docker-login-token.outputs.docker-login-password }}
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
needs:
- save-docker-login-token
- acquire-base-image
if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' }}
if: ${{ github.event.pull_request.head.repo.full_name == 'smithy-lang/smithy-rs' }}
uses: ./.github/workflows/ci.yml
with:
run_sdk_examples: true
Expand All @@ -97,7 +97,7 @@ jobs:
# The PR bot requires a Docker build image, so make it depend on the `acquire-base-image` job.
pr_bot:
name: PR Bot
if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' }}
if: ${{ github.event.pull_request.head.repo.full_name == 'smithy-lang/smithy-rs' }}
needs: acquire-base-image
uses: ./.github/workflows/pull-request-bot.yml
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-sdk-next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Check out `smithy-rs`
uses: actions/checkout@v3
with:
repository: awslabs/smithy-rs
repository: smithy-lang/smithy-rs
ref: ${{ inputs.generate_ref }}
path: smithy-rs
- name: Check out `aws-sdk-rust`
Expand Down
590 changes: 295 additions & 295 deletions CHANGELOG.md

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
* @awslabs/rust-sdk-owners
* @smithy-lang/aws-sdk-rust

# Server
/codegen-server-test/ @awslabs/smithy-rs-server
/codegen-server/ @awslabs/smithy-rs-server
/rust-runtime/aws-smithy-http-server/ @awslabs/smithy-rs-server
/codegen-server-test/ @smithy-lang/smithy-rs-server
/codegen-server/ @smithy-lang/smithy-rs-server
/rust-runtime/aws-smithy-http-server/ @smithy-lang/smithy-rs-server

# Python Server
/codegen-server-test/python/ @awslabs/smithy-rs-python-server @awslabs/smithy-rs-server
/codegen-server/python/ @awslabs/smithy-rs-python-server @awslabs/smithy-rs-server
/rust-runtime/aws-smithy-http-server-python/ @awslabs/smithy-rs-python-server @awslabs/smithy-rs-server
/codegen-server-test/python/ @smithy-lang/smithy-rs-server
/codegen-server/python/ @smithy-lang/smithy-rs-server
/rust-runtime/aws-smithy-http-server-python/ @smithy-lang/smithy-rs-server

# Typescript Server
/codegen-server-test/typescript/ @awslabs/smithy-rs-typescript-server @awslabs/smithy-rs-server
/codegen-server/typescript/ @awslabs/smithy-rs-typescript-server @awslabs/smithy-rs-server
/rust-runtime/aws-smithy-http-server-typescript/ @awslabs/smithy-rs-typescript-server @awslabs/smithy-rs-server
/codegen-server-test/typescript/ @smithy-lang/smithy-rs-server
/codegen-server/typescript/ @smithy-lang/smithy-rs-server
/rust-runtime/aws-smithy-http-server-typescript/ @smithy-lang/smithy-rs-server

# Shared ownership
/.github/ @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/CHANGELOG.md @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/CHANGELOG.next.toml @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/README.md @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/build.gradle.kts @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/buildSrc/ @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/codegen-core/ @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/design/ @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/examples/ @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/gradle.properties @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/tools/ @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/rust-runtime/aws-smithy-async/ @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/rust-runtime/aws-smithy-eventstream/ @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/rust-runtime/aws-smithy-http/ @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/rust-runtime/aws-smithy-json/ @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/rust-runtime/aws-smithy-protocol-test/ @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/rust-runtime/aws-smithy-types/ @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/rust-runtime/aws-smithy-types-convert/ @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/rust-runtime/aws-smithy-xml/ @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/rust-runtime/inlineable/ @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/rust-runtime/build.gradle.kts @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/rust-runtime/Cargo.toml @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/.github/ @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/CHANGELOG.md @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/CHANGELOG.next.toml @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/README.md @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/build.gradle.kts @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/buildSrc/ @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/codegen-core/ @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/design/ @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/examples/ @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/gradle.properties @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/tools/ @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/rust-runtime/aws-smithy-async/ @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/rust-runtime/aws-smithy-eventstream/ @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/rust-runtime/aws-smithy-http/ @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/rust-runtime/aws-smithy-json/ @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/rust-runtime/aws-smithy-protocol-test/ @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/rust-runtime/aws-smithy-types/ @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/rust-runtime/aws-smithy-types-convert/ @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/rust-runtime/aws-smithy-xml/ @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/rust-runtime/inlineable/ @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/rust-runtime/build.gradle.kts @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
/rust-runtime/Cargo.toml @smithy-lang/aws-sdk-rust @smithy-lang/smithy-rs-server
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Smithy Rust [![CI on Branch `main`](https://github.com/awslabs/smithy-rs/actions/workflows/ci-main.yml/badge.svg)](https://github.com/awslabs/smithy-rs/actions/workflows/ci-main.yml)
Smithy Rust [![CI on Branch `main`](https://github.com/smithy-lang/smithy-rs/actions/workflows/ci-main.yml/badge.svg)](https://github.com/smithy-lang/smithy-rs/actions/workflows/ci-main.yml)
==================================================================================

Smithy code generators for Rust that generate clients, servers, and the entire AWS SDK.
Expand Down
8 changes: 4 additions & 4 deletions aws/SDK_CHANGELOG.next.json
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@
"age": 2
},
{
"message": "HTTP connector configuration has changed significantly. See the [upgrade guidance](https://github.com/awslabs/smithy-rs/discussions/3022) for details.",
"message": "HTTP connector configuration has changed significantly. See the [upgrade guidance](https://github.com/smithy-lang/smithy-rs/discussions/3022) for details.",
"meta": {
"bug": false,
"breaking": true,
Expand Down Expand Up @@ -454,7 +454,7 @@
"age": 2
},
{
"message": "Struct members modeled as required are no longer wrapped in `Option`s [when possible](https://smithy.io/2.0/spec/aggregate-types.html#structure-member-optionality). For upgrade guidance and more info, see [here](https://github.com/awslabs/smithy-rs/discussions/2929).",
"message": "Struct members modeled as required are no longer wrapped in `Option`s [when possible](https://smithy.io/2.0/spec/aggregate-types.html#structure-member-optionality). For upgrade guidance and more info, see [here](https://github.com/smithy-lang/smithy-rs/discussions/2929).",
"meta": {
"bug": false,
"breaking": true,
Expand Down Expand Up @@ -686,7 +686,7 @@
"age": 2
},
{
"message": "Retry classifiers are now configurable at the service and operation levels. Users may also define their own custom retry classifiers.\n\nFor more information, see the [guide](https://github.com/awslabs/smithy-rs/discussions/3050).\n",
"message": "Retry classifiers are now configurable at the service and operation levels. Users may also define their own custom retry classifiers.\n\nFor more information, see the [guide](https://github.com/smithy-lang/smithy-rs/discussions/3050).\n",
"meta": {
"bug": false,
"breaking": true,
Expand Down Expand Up @@ -800,4 +800,4 @@
}
],
"aws-sdk-model": []
}
}
8 changes: 4 additions & 4 deletions aws/SDK_README.md.hb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Available template arguments:
--}}
<!--
IMPORTANT:
This README file is auto-generated by the build system in awslabs/smithy-rs.
This README file is auto-generated by the build system in smithy-lang/smithy-rs.
To update it, edit the `aws/SDK_README.md.hb` Handlebars template in that repository.
-->

Expand All @@ -18,7 +18,7 @@ This repo contains the new AWS SDK for Rust (the SDK) and its [public roadmap](h

**Please Note**: The SDK is currently released as a developer preview, without support or assistance for use on production workloads. Any use in production is at your own risk.

The SDK is code generated from [Smithy models](https://awslabs.github.io/smithy/) that represent each AWS service. The code used to generate the SDK can be found in [smithy-rs](https://github.com/awslabs/smithy-rs).
The SDK is code generated from [Smithy models](https://awslabs.github.io/smithy/) that represent each AWS service. The code used to generate the SDK can be found in [smithy-rs](https://github.com/smithy-lang/smithy-rs).

## Getting Started with the SDK

Expand Down Expand Up @@ -94,8 +94,8 @@ The SDK currently requires a minimum of Rust {{msrv}}, and is not guaranteed to
## Additional Resources
- Design docs - Design documentation for the SDK lives in the [design folder of smithy-rs](https://github.com/awslabs/smithy-rs/tree/main/design).
- Runtime / Handwritten code: The Rust Runtime code that underpins the SDK can be accessed [here](https://github.com/awslabs/smithy-rs/tree/main/rust-runtime) and [here](https://github.com/awslabs/smithy-rs/tree/main/aws/rust-runtime). This code is copied into this repo as part of code generation.
- Design docs - Design documentation for the SDK lives in the [design folder of smithy-rs](https://github.com/smithy-lang/smithy-rs/tree/main/design).
- Runtime / Handwritten code: The Rust Runtime code that underpins the SDK can be accessed [here](https://github.com/smithy-lang/smithy-rs/tree/main/rust-runtime) and [here](https://github.com/smithy-lang/smithy-rs/tree/main/aws/rust-runtime). This code is copied into this repo as part of code generation.
- [Code Examples](./examples)
- [API reference documentation (rustdoc)](https://awslabs.github.io/aws-sdk-rust/)
Expand Down
2 changes: 1 addition & 1 deletion aws/rust-runtime/aws-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "AWS SDK config and credential provider implementations."
edition = "2021"
exclude = ["test-data/*", "integration-tests/*"]
license = "Apache-2.0"
repository = "https://github.com/awslabs/smithy-rs"
repository = "https://github.com/smithy-lang/smithy-rs"

[features]
client-hyper = ["aws-smithy-runtime/connector-hyper-0-14-x"]
Expand Down
2 changes: 1 addition & 1 deletion aws/rust-runtime/aws-config/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ This project is licensed under the Apache-2.0 License.
[Usage examples]: https://github.com/awslabs/aws-sdk-rust/tree/main/examples

<!-- anchor_start:footer -->
This crate is part of the [AWS SDK for Rust](https://awslabs.github.io/aws-sdk-rust/) and the [smithy-rs](https://github.com/awslabs/smithy-rs) code generator.
This crate is part of the [AWS SDK for Rust](https://awslabs.github.io/aws-sdk-rust/) and the [smithy-rs](https://github.com/smithy-lang/smithy-rs) code generator.
<!-- anchor_end:footer -->
2 changes: 1 addition & 1 deletion aws/rust-runtime/aws-config/external-types.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ allowed_external_types = [
"http::uri::Uri",
"tower_service::Service",

# TODO(https://github.com/awslabs/smithy-rs/issues/1193): Decide if the following should be exposed
# TODO(https://github.com/smithy-lang/smithy-rs/issues/1193): Decide if the following should be exposed
"hyper::client::connect::Connection",
"tokio::io::async_read::AsyncRead",
"tokio::io::async_write::AsyncWrite",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ impl Builder {

/// Resolve default timeout configuration
pub async fn timeout_config(self) -> TimeoutConfig {
// TODO(https://github.com/awslabs/smithy-rs/issues/1732): Implement complete timeout defaults specification
// TODO(https://github.com/smithy-lang/smithy-rs/issues/1732): Implement complete timeout defaults specification
TimeoutConfig::builder()
.connect_timeout(SDK_DEFAULT_CONNECT_TIMEOUT)
.build()
Expand Down
2 changes: 1 addition & 1 deletion aws/rust-runtime/aws-config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ mod loader {

/// Deprecated. Don't use.
#[deprecated(
note = "HTTP connector configuration changed. See https://github.com/awslabs/smithy-rs/discussions/3022 for upgrade guidance."
note = "HTTP connector configuration changed. See https://github.com/smithy-lang/smithy-rs/discussions/3022 for upgrade guidance."
)]
pub fn http_connector(self, http_client: impl HttpClient + 'static) -> Self {
self.http_client(http_client)
Expand Down
2 changes: 1 addition & 1 deletion aws/rust-runtime/aws-config/src/provider_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ impl ProviderConfig {

/// Deprecated. Don't use.
#[deprecated(
note = "HTTP connector configuration changed. See https://github.com/awslabs/smithy-rs/discussions/3022 for upgrade guidance."
note = "HTTP connector configuration changed. See https://github.com/smithy-lang/smithy-rs/discussions/3022 for upgrade guidance."
)]
pub fn with_tcp_connector(self, http_client: impl HttpClient + 'static) -> Self {
self.with_http_client(http_client)
Expand Down
2 changes: 1 addition & 1 deletion aws/rust-runtime/aws-credential-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["AWS Rust SDK Team <[email protected]>"]
description = "Types for AWS SDK credentials."
edition = "2021"
license = "Apache-2.0"
repository = "https://github.com/awslabs/smithy-rs"
repository = "https://github.com/smithy-lang/smithy-rs"

[features]
hardcoded-credentials = []
Expand Down
2 changes: 1 addition & 1 deletion aws/rust-runtime/aws-credential-types/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ This crate provides types concerned with AWS SDK credentials including:
* Concrete implementations of credentials caching

<!-- anchor_start:footer -->
This crate is part of the [AWS SDK for Rust](https://awslabs.github.io/aws-sdk-rust/) and the [smithy-rs](https://github.com/awslabs/smithy-rs) code generator. In most cases, it should not be used directly.
This crate is part of the [AWS SDK for Rust](https://awslabs.github.io/aws-sdk-rust/) and the [smithy-rs](https://github.com/smithy-lang/smithy-rs) code generator. In most cases, it should not be used directly.
<!-- anchor_end:footer -->
2 changes: 1 addition & 1 deletion aws/rust-runtime/aws-endpoint/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["AWS Rust SDK Team <[email protected]>", "Russell Cohen <rcoh@a
description = "This crate is no longer used by the AWS SDK and is deprecated."
edition = "2021"
license = "Apache-2.0"
repository = "https://github.com/awslabs/smithy-rs"
repository = "https://github.com/smithy-lang/smithy-rs"

[package.metadata.docs.rs]
all-features = true
Expand Down
2 changes: 1 addition & 1 deletion aws/rust-runtime/aws-endpoint/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
This crate is no longer used by the AWS SDK and is deprecated.

<!-- anchor_start:footer -->
This crate is part of the [AWS SDK for Rust](https://awslabs.github.io/aws-sdk-rust/) and the [smithy-rs](https://github.com/awslabs/smithy-rs) code generator. In most cases, it should not be used directly.
This crate is part of the [AWS SDK for Rust](https://awslabs.github.io/aws-sdk-rust/) and the [smithy-rs](https://github.com/smithy-lang/smithy-rs) code generator. In most cases, it should not be used directly.
<!-- anchor_end:footer -->
2 changes: 1 addition & 1 deletion aws/rust-runtime/aws-http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["AWS Rust SDK Team <[email protected]>", "Russell Cohen <rcoh@a
description = "HTTP specific AWS SDK behaviors."
edition = "2021"
license = "Apache-2.0"
repository = "https://github.com/awslabs/smithy-rs"
repository = "https://github.com/smithy-lang/smithy-rs"

[dependencies]
aws-smithy-http = { path = "../../../rust-runtime/aws-smithy-http" }
Expand Down
2 changes: 1 addition & 1 deletion aws/rust-runtime/aws-http/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ This crate provides middleware for AWS SDKs using HTTP including:
* Credential loading async middleware

<!-- anchor_start:footer -->
This crate is part of the [AWS SDK for Rust](https://awslabs.github.io/aws-sdk-rust/) and the [smithy-rs](https://github.com/awslabs/smithy-rs) code generator. In most cases, it should not be used directly.
This crate is part of the [AWS SDK for Rust](https://awslabs.github.io/aws-sdk-rust/) and the [smithy-rs](https://github.com/smithy-lang/smithy-rs) code generator. In most cases, it should not be used directly.
<!-- anchor_end:footer -->
Loading

0 comments on commit 6438a09

Please sign in to comment.