44 "context"
55 "errors"
66 "fmt"
7+ "path/filepath"
78 "time"
89
910 authenticationv1api "k8s.io/api/authentication/v1"
@@ -56,6 +57,11 @@ func (c *ACMProviderConfig) Validate() error {
5657 return err
5758}
5859
60+ func (c * ACMProviderConfig ) ResolveClusterProxyAddonCAFilePath (ctx context.Context ) {
61+ path := config .ConfigDirPathFromContext (ctx )
62+ c .ClusterProxyAddonCAFile = filepath .Join (path , c .ClusterProxyAddonCAFile )
63+ }
64+
5965type ACMKubeConfigProviderConfig struct {
6066 ACMProviderConfig
6167
@@ -74,22 +80,26 @@ func (c *ACMKubeConfigProviderConfig) Validate() error {
7480 return err
7581}
7682
77- func parseAcmConfig (primitive toml.Primitive , md toml.MetaData ) (config.ProviderConfig , error ) {
78- var cfg ACMProviderConfig
79- if err := md .PrimitiveDecode (primitive , & cfg ); err != nil {
83+ func parseAcmConfig (ctx context. Context , primitive toml.Primitive , md toml.MetaData ) (config.ProviderConfig , error ) {
84+ cfg := & ACMProviderConfig {}
85+ if err := md .PrimitiveDecode (primitive , cfg ); err != nil {
8086 return nil , err
8187 }
8288
83- return & cfg , nil
89+ cfg .ResolveClusterProxyAddonCAFilePath (ctx )
90+
91+ return cfg , nil
8492}
8593
86- func parseAcmKubeConfigConfig (primitive toml.Primitive , md toml.MetaData ) (config.ProviderConfig , error ) {
87- var cfg ACMKubeConfigProviderConfig
94+ func parseAcmKubeConfigConfig (ctx context. Context , primitive toml.Primitive , md toml.MetaData ) (config.ProviderConfig , error ) {
95+ cfg := & ACMKubeConfigProviderConfig {}
8896 if err := md .PrimitiveDecode (primitive , & cfg ); err != nil {
8997 return nil , err
9098 }
9199
92- return & cfg , nil
100+ cfg .ResolveClusterProxyAddonCAFilePath (ctx )
101+
102+ return cfg , nil
93103}
94104
95105type acmHubClusterProvider struct {
0 commit comments