@@ -62,14 +62,14 @@ export class AwsEksDetector implements Detector {
62
62
async detect ( config : ResourceDetectionConfigWithLogger ) : Promise < Resource > {
63
63
try {
64
64
await AwsEksDetector . fileAccessAsync ( this . K8S_TOKEN_PATH ) ;
65
- const k8Scert = await AwsEksDetector . readFileAsync ( this . K8S_CERT_PATH ) ;
65
+ const k8scert = await AwsEksDetector . readFileAsync ( this . K8S_CERT_PATH ) ;
66
66
67
- if ( ! this . _isEks ( config , k8Scert ) ) {
67
+ if ( ! this . _isEks ( config , k8scert ) ) {
68
68
return Resource . empty ( ) ;
69
69
}
70
70
71
71
const containerId = await this . _getContainerId ( config ) ;
72
- const clusterName = await this . _getClusterName ( config , k8Scert ) ;
72
+ const clusterName = await this . _getClusterName ( config , k8scert ) ;
73
73
74
74
return ! containerId && ! clusterName
75
75
? Resource . empty ( )
@@ -78,7 +78,7 @@ export class AwsEksDetector implements Detector {
78
78
[ CONTAINER_RESOURCE . ID ] : containerId || '' ,
79
79
} ) ;
80
80
} catch ( e ) {
81
- config . logger . warn ( 'Not running on K8S' ) ;
81
+ config . logger . warn ( 'This process is not running on Kubernetes because either the token path or certificate path cannot be accessed ' , e ) ;
82
82
return Resource . empty ( ) ;
83
83
}
84
84
}
@@ -91,7 +91,7 @@ export class AwsEksDetector implements Detector {
91
91
*/
92
92
private async _isEks (
93
93
config : ResourceDetectionConfigWithLogger ,
94
- k8scert : Buffer
94
+ cert : Buffer
95
95
) : Promise < boolean > {
96
96
const options = {
97
97
hostname : this . K8S_SVC_URL ,
@@ -101,7 +101,7 @@ export class AwsEksDetector implements Detector {
101
101
headers : {
102
102
Authorization : await this . _getK8sCredHeader ( config ) ,
103
103
} ,
104
- ca : k8scert ,
104
+ ca : cert ,
105
105
} ;
106
106
return ! ! ( await this . _fetchString ( options ) ) ;
107
107
}
@@ -113,7 +113,7 @@ export class AwsEksDetector implements Detector {
113
113
*/
114
114
private async _getClusterName (
115
115
config : ResourceDetectionConfigWithLogger ,
116
- k8scert : Buffer
116
+ cert : Buffer
117
117
) : Promise < string | undefined > {
118
118
const options = {
119
119
host : this . K8S_SVC_URL ,
@@ -123,7 +123,7 @@ export class AwsEksDetector implements Detector {
123
123
headers : {
124
124
Authorization : await this . _getK8sCredHeader ( config ) ,
125
125
} ,
126
- ca : k8scert ,
126
+ ca : cert ,
127
127
} ;
128
128
return await this . _fetchString ( options ) ;
129
129
}
@@ -142,7 +142,7 @@ export class AwsEksDetector implements Detector {
142
142
) ;
143
143
return 'Bearer ' + content ;
144
144
} catch ( e ) {
145
- config . logger . warn ( 'Unable to load K8s client token.' , e ) ;
145
+ config . logger . warn ( 'Unable to read Kubernetes client token.' , e ) ;
146
146
}
147
147
return '' ;
148
148
}
0 commit comments