Commit 0ebfb853 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

style: fix code formatting issues

parent a74ab6cb

.pre-commit-config.yaml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ repos: 
      - id: check-case-conflict

      - id: check-executables-have-shebangs

      - id: check-json

      - id: check-yaml

      # - id: check-yaml

      - id: check-merge-conflict

      - id: debug-statements

      - id: detect-private-key

aws_auth_provider/main.py

+48 −34
Original line number Diff line number Diff line
@@ -53,9 +53,9 @@ def configure_boto(env_ctx: str = None, region: str = None, role_arn: str = None 
            token_file.close()

        os.environ["AWS_ROLE_ARN"] = role_arn

        os.environ["AWS_WEB_IDENTITY_TOKEN_FILE"] = token_file.name

        os.environ[

            "AWS_ROLE_SESSION_NAME"

        ] = f"GitLabRunner-{os.getenv('CI_PROJECT_ID')}-{os.getenv('CI_PIPELINE_ID')}"

        os.environ["AWS_ROLE_SESSION_NAME"] = (

            f"GitLabRunner-{os.getenv('CI_PROJECT_ID')}-{os.getenv('CI_PIPELINE_ID')}"

        )

        return



    access_key_id = getenv_cleared(f"AWS_{env_ctx}_ACCESS_KEY_ID") or getenv_cleared(
@@ -187,29 +187,33 @@ def get_codeartifact_auth_token( 
    configure_boto(env_ctx, region, role_arn)

    # see: https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/codeartifact/client/get_authorization_token.html

    client = boto3.client("codeartifact")

    domain = domain or getenv_cleared(f"AWS_{env_ctx}_CODEARTIFACT_DOMAIN") or getenv_cleared(

        "AWS_CODEARTIFACT_DOMAIN"

    domain = (

        domain

        or getenv_cleared(f"AWS_{env_ctx}_CODEARTIFACT_DOMAIN")

        or getenv_cleared("AWS_CODEARTIFACT_DOMAIN")

    )



    if not domain:

        logger.error("AWS CodeArtifact domain not found")

        raise HTTPException(status_code=400, detail="AWS CodeArtifact domain not found")



    domain_owner = domain_owner or getenv_cleared(

        f"AWS_{env_ctx}_CODEARTIFACT_DOMAIN_OWNER"

    ) or getenv_cleared("AWS_CODEARTIFACT_DOMAIN_OWNER")

    domain_owner = (

        domain_owner

        or getenv_cleared(f"AWS_{env_ctx}_CODEARTIFACT_DOMAIN_OWNER")

        or getenv_cleared("AWS_CODEARTIFACT_DOMAIN_OWNER")

    )



    if not domain_owner:

        logger.error("AWS CodeArtifact domain owner not found")

        raise HTTPException(

            status_code=400, detail="AWS CodeArtifact domain owner not found")

    

    response = client.get_authorization_token(

        domain=domain, domainOwner=domain_owner

            status_code=400, detail="AWS CodeArtifact domain owner not found"

        )



    response = client.get_authorization_token(domain=domain, domainOwner=domain_owner)



    return response["authorizationToken"]





@app.get("/codeartifact/repository/endpoint", response_class=PlainTextResponse)

@cache

def get_codeartifact_repository_endpoint(
@@ -219,36 +223,46 @@ def get_codeartifact_repository_endpoint( 
    domain: str = Query(default=None, alias="domain"),

    domain_owner: str = Query(default=None, alias="domain_owner"),

    repository: str = Query(default=None, alias="repository"),

    format: Literal['npm','pypi','maven','nuget','generic','ruby','swift','cargo'] = Query(alias='format')

    format: Literal[

        "npm", "pypi", "maven", "nuget", "generic", "ruby", "swift", "cargo"

    ] = Query(alias="format"),

) -> str:

    configure_boto(env_ctx, region, role_arn)

    # see: https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/codeartifact/client/get_repository_endpoint.html

    client = boto3.client("codeartifact")

    domain = domain or getenv_cleared(f"AWS_{env_ctx}_CODEARTIFACT_DOMAIN") or getenv_cleared(

        "AWS_CODEARTIFACT_DOMAIN"

    domain = (

        domain

        or getenv_cleared(f"AWS_{env_ctx}_CODEARTIFACT_DOMAIN")

        or getenv_cleared("AWS_CODEARTIFACT_DOMAIN")

    )



    if not domain:

        logger.error("AWS CodeArtifact domain not found")

        raise HTTPException(status_code=400, detail="AWS CodeArtifact domain not found")



    domain_owner = domain_owner or getenv_cleared(

        f"AWS_{env_ctx}_CODEARTIFACT_DOMAIN_OWNER"

    ) or getenv_cleared("AWS_CODEARTIFACT_DOMAIN_OWNER")

    domain_owner = (

        domain_owner

        or getenv_cleared(f"AWS_{env_ctx}_CODEARTIFACT_DOMAIN_OWNER")

        or getenv_cleared("AWS_CODEARTIFACT_DOMAIN_OWNER")

    )



    if not domain_owner:

        logger.error("AWS CodeArtifact domain owner not found")

        raise HTTPException(

            status_code=400, detail="AWS CodeArtifact domain owner not found")

            status_code=400, detail="AWS CodeArtifact domain owner not found"

        )



    repository = repository or getenv_cleared(

        f"AWS_{env_ctx}_CODEARTIFACT_REPOSITORY"

    ) or getenv_cleared("AWS_CODEARTIFACT_REPOSITORY")

    repository = (

        repository

        or getenv_cleared(f"AWS_{env_ctx}_CODEARTIFACT_REPOSITORY")

        or getenv_cleared("AWS_CODEARTIFACT_REPOSITORY")

    )



    if not repository:

        logger.error("AWS CodeArtifact repository not found")

        raise HTTPException(

            status_code=400, detail="AWS CodeArtifact repository not found")

            status_code=400, detail="AWS CodeArtifact repository not found"

        )



    response = client.get_repository_endpoint(

        domain=domain, domainOwner=domain_owner, repository=repository, format=format

LICENSE.txt

+1 −1

File changed.

Contains only whitespace changes.

README.md

+5 −5

File changed.

Contains only whitespace changes.

SECURITY.md

+1 −1

File changed.

Contains only whitespace changes.

.gitlab-ci.yml

+2 −2

File changed.

Contains only whitespace changes.

DCO.txt

+1 −1

File changed.

Contains only whitespace changes.