mirror of
https://github.com/storytold/irsa-manager.git
synced 2026-10-09 00:09:43 +00:00
change dir name
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
package client
|
package aws
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package client
|
package aws
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
@@ -26,7 +26,7 @@ import (
|
|||||||
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
|
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
|
||||||
|
|
||||||
irsav1alpha1 "github.com/kkb0318/irsa-manager/api/v1alpha1"
|
irsav1alpha1 "github.com/kkb0318/irsa-manager/api/v1alpha1"
|
||||||
awsclient "github.com/kkb0318/irsa-manager/internal/client"
|
awsclient "github.com/kkb0318/irsa-manager/internal/aws"
|
||||||
"github.com/kkb0318/irsa-manager/internal/handler"
|
"github.com/kkb0318/irsa-manager/internal/handler"
|
||||||
"github.com/kkb0318/irsa-manager/internal/kubernetes"
|
"github.com/kkb0318/irsa-manager/internal/kubernetes"
|
||||||
"github.com/kkb0318/irsa-manager/internal/manifests"
|
"github.com/kkb0318/irsa-manager/internal/manifests"
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ import (
|
|||||||
"k8s.io/apimachinery/pkg/types"
|
"k8s.io/apimachinery/pkg/types"
|
||||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||||
|
|
||||||
awsclient "github.com/kkb0318/irsa-manager/internal/client"
|
awsclient "github.com/kkb0318/irsa-manager/internal/aws"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
|
|
||||||
irsav1alpha1 "github.com/kkb0318/irsa-manager/api/v1alpha1"
|
irsav1alpha1 "github.com/kkb0318/irsa-manager/api/v1alpha1"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ package oidc
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
awsclient "github.com/kkb0318/irsa-manager/internal/client"
|
awsclient "github.com/kkb0318/irsa-manager/internal/aws"
|
||||||
"github.com/kkb0318/irsa-manager/internal/selfhosted"
|
"github.com/kkb0318/irsa-manager/internal/selfhosted"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -3,17 +3,17 @@ package oidc
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"github.com/kkb0318/irsa-manager/internal/client"
|
awsclient "github.com/kkb0318/irsa-manager/internal/aws"
|
||||||
"github.com/kkb0318/irsa-manager/internal/selfhosted"
|
"github.com/kkb0318/irsa-manager/internal/selfhosted"
|
||||||
)
|
)
|
||||||
|
|
||||||
type AwsIdP struct {
|
type AwsIdP struct {
|
||||||
iamClient *client.AwsIamClient
|
iamClient *awsclient.AwsIamClient
|
||||||
stsClient *client.AwsStsClient
|
stsClient *awsclient.AwsStsClient
|
||||||
issuerMeta selfhosted.OIDCIssuerMeta
|
issuerMeta selfhosted.OIDCIssuerMeta
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewAwsIdP(awsConfig client.AwsClient, issuerMeta selfhosted.OIDCIssuerMeta) (*AwsIdP, error) {
|
func NewAwsIdP(awsConfig awsclient.AwsClient, issuerMeta selfhosted.OIDCIssuerMeta) (*AwsIdP, error) {
|
||||||
iamClient := awsConfig.IamClient()
|
iamClient := awsConfig.IamClient()
|
||||||
stsClient := awsConfig.StsClient()
|
stsClient := awsConfig.StsClient()
|
||||||
return &AwsIdP{iamClient, stsClient, issuerMeta}, nil
|
return &AwsIdP{iamClient, stsClient, issuerMeta}, nil
|
||||||
|
|||||||
@@ -4,19 +4,19 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/kkb0318/irsa-manager/internal/client"
|
awsclient "github.com/kkb0318/irsa-manager/internal/aws"
|
||||||
"github.com/kkb0318/irsa-manager/internal/selfhosted"
|
"github.com/kkb0318/irsa-manager/internal/selfhosted"
|
||||||
)
|
)
|
||||||
|
|
||||||
const CONFIGURATION_PATH = ".well-known/openid-configuration"
|
const CONFIGURATION_PATH = ".well-known/openid-configuration"
|
||||||
|
|
||||||
type S3IdPDiscovery struct {
|
type S3IdPDiscovery struct {
|
||||||
s3Client *client.AwsS3Client
|
s3Client *awsclient.AwsS3Client
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewS3IdPDiscovery initializes a new instance of S3IdPCreator with the specified AWS region and bucket name.
|
// NewS3IdPDiscovery initializes a new instance of S3IdPCreator with the specified AWS region and bucket name.
|
||||||
// This function attempts to create an AWS client configured for the specified region.
|
// This function attempts to create an AWS client configured for the specified region.
|
||||||
func NewS3IdPDiscovery(awsConfig client.AwsClient, region, bucketName string) *S3IdPDiscovery {
|
func NewS3IdPDiscovery(awsConfig awsclient.AwsClient, region, bucketName string) *S3IdPDiscovery {
|
||||||
s3Client := awsConfig.S3Client(region, bucketName)
|
s3Client := awsConfig.S3Client(region, bucketName)
|
||||||
return &S3IdPDiscovery{s3Client}
|
return &S3IdPDiscovery{s3Client}
|
||||||
}
|
}
|
||||||
@@ -41,7 +41,7 @@ func (s *S3IdPDiscovery) Upload(ctx context.Context, o selfhosted.OIDCIdPDiscove
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
inputs := []client.ObjectInput{
|
inputs := []awsclient.ObjectInput{
|
||||||
{
|
{
|
||||||
Key: CONFIGURATION_PATH,
|
Key: CONFIGURATION_PATH,
|
||||||
Body: discovery,
|
Body: discovery,
|
||||||
|
|||||||
Reference in New Issue
Block a user