sarutak opened a new pull request, #57985:
URL: https://github.com/apache/spark/pull/57985
### What changes were proposed in this pull request?
This PR reverts all OIDC credential propagation commits from `branch-4.3`.
The feature will ship in `4.4.0` instead.
**Reverted commits (newest first):**
| Commit | Description |
|--------|-------------|
| `b7d480b53e4` | [SPARK-58504] Simplify FileTokenIngestor cache and detect
rotation by content |
| `1623ebd0932` | [SPARK-58472] Add `AutoCloseable` lifecycle to
`CredentialProvider` SPI |
| `e9b8b1b1301` | [SPARK-57897] Create `connector/credential-aws` module
with CI/release integration |
| `057b6079689` | [SPARK-57893] Implement `UserCredentialManager` |
| `72c284fb1c2` | [SPARK-58364] Rename the configuration namespace from
`spark.security.credentials` to `spark.security.oidc` |
| `b02704ad2ce` | [SPARK-57892] Add TokenIngestor interface and
FileTokenIngestor implementation |
| `e1eed92c6bc` | [SPARK-57891][FOLLOWUP] Fix contradictory thread-safety
docs in `CredentialProviderLoader` |
| `54af016ec8a` | [SPARK-57891] Add CredentialProvider SPI and ServiceLoader
discovery |
| `177b6cec95f` | [SPARK-57890] Add core credential types (UserContext,
ServiceCredential, UserCredentials) |
**Not reverted:**
| Commit | Reason |
|--------|--------|
| `825f76a7e47` ([SPARK-57897][4.X][BUILD][FOLLOWUP]) | Contains a fix to
`sql/connect/client/jdbc/pom.xml` (gRPC API version) unrelated to OIDC. The
OIDC-related portion (`connector/credential-aws/pom.xml`) is removed by the
revert of `e9b8b1b1301`. |
**Conflict resolutions:**
1. **`connector/credential-aws/pom.xml`** (during revert of `e9b8b1b1301`):
- Conflict type: modify/delete. The file was added by `e9b8b1b1301` and
later modified by `825f76a7e47` (parent version fix). Since the entire module
is being removed, resolved by `git rm`.
2. **`core/src/main/scala/org/apache/spark/internal/config/package.scala`**
(during revert of `057b6079689`):
- Conflict type: content. The OIDC config keys (`SECURITY_OIDC_*`) were
added by `057b6079689`, and `DIRECT_CREDENTIAL_PROVIDERS_ENABLED` was added by
a separate commit (`bcbe9e0fdd8`, SPARK-38954) in the same region.
- Resolution: Removed the four `SECURITY_OIDC_*` config keys while
**retaining** `DIRECT_CREDENTIAL_PROVIDERS_ENABLED`, which is used by
SPARK-38954 (independent of OIDC).
### Why are the changes needed?
The OIDC credential propagation feature was backported to `branch-4.3`
during development, but the release target has been moved to 4.4.0. Version
annotations on master have already been updated to 4.4.0.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
`build/sbt "core/compile"` passes after all reverts.
### Was this patch authored or co-authored using generative AI tooling?
Kiro CLI / Claude
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
