Skip to content

Commit bd1b5ad

Browse files
ShihabMehboobsandmman
ShihabMehboob
authored and
sandmman
committed
Changed mappings to include credentials (#48)
* Changed mappings to include credentials * Updated README
1 parent d6eda5c commit bd1b5ad

3 files changed

Lines changed: 139 additions & 99 deletions

File tree

‎README.md‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,22 @@ You specify lookup keys and search patterns in a file named `mappings.json`. Thi
2323
```javascript
2424
{
2525
"cloudant-credentials": {
26-
"searchPatterns": [
27-
"cloudfoundry:my-awesome-cloudant-db",
28-
"env:my_awesome_cloudant_db_credentials",
29-
"file:localdev/my-awesome-cloudant-db-credentials.json"
30-
]
26+
"credentials": {
27+
"searchPatterns": [
28+
"cloudfoundry:my-awesome-cloudant-db",
29+
"env:my_awesome_cloudant_db_credentials",
30+
"file:localdev/my-awesome-cloudant-db-credentials.json"
31+
]
32+
}
3133
},
3234
"object-storage-credentials": {
33-
"searchPatterns": [
34-
"cloudfoundry:my-awesome-object-storage",
35-
"env:my_awesome_object_storage_credentials",
36-
"file:localdev/my-awesome-object-storage-credentials.json"
37-
]
35+
"credentials": {
36+
"searchPatterns": [
37+
"cloudfoundry:my-awesome-object-storage",
38+
"env:my_awesome_object_storage_credentials",
39+
"file:localdev/my-awesome-object-storage-credentials.json"
40+
]
41+
}
3842
}
3943
}
4044
```

‎Sources/CloudEnvironment/CloudEnv.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public class CloudEnv {
8888
/// - Parameter name: The key to lookup the environment variable.
8989
public func getDictionary(name: String) -> [String : Any]? {
9090

91-
guard let searchPatterns = mapManager["\(name):searchPatterns"] as? [String] else {
91+
guard let searchPatterns = mapManager["\(name):credentials:searchPatterns"] as? [String] else {
9292
Log.debug("No search patterns found. There may have been a problem loading '\(CloudEnv.mappingsFile)'.")
9393
return nil
9494
}

‎Tests/CloudEnvironmentTests/resources/mappings.json‎

Lines changed: 124 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,162 @@
11
{
22
"AlertNotificationKey": {
3-
"searchPatterns": [
4-
"file:Tests/CloudEnvironmentTests/resources/non-existing-file.json",
5-
"env:kubeEVINVALID",
6-
"cloudfoundry:AlertNotificationService"
7-
]
3+
"credentials": {
4+
"searchPatterns": [
5+
"file:Tests/CloudEnvironmentTests/resources/non-existing-file.json",
6+
"env:kubeEVINVALID",
7+
"cloudfoundry:AlertNotificationService"
8+
]
9+
}
810
},
911
"AlertNotificationEVKey": {
10-
"searchPatterns": [
11-
"file:Tests/CloudEnvironmentTests/resources/non-existing-file.json",
12-
"cloudfoundry:my-cloudant-instance-1",
13-
"env:KUBE_ENV"
14-
]
12+
"credentials": {
13+
"searchPatterns": [
14+
"file:Tests/CloudEnvironmentTests/resources/non-existing-file.json",
15+
"cloudfoundry:my-cloudant-instance-1",
16+
"env:KUBE_ENV"
17+
]
18+
}
1519
},
1620
"AlertNotificationFileNoKey": {
17-
"searchPatterns": [
18-
"file:Tests/CloudEnvironmentTests/resources/config_file_no_key.json",
19-
"env:KUBE_ENV_WRONG",
20-
"cloudfoundry:my-cloudant-instance-1"
21-
]
21+
"credentials": {
22+
"searchPatterns": [
23+
"file:Tests/CloudEnvironmentTests/resources/config_file_no_key.json",
24+
"env:KUBE_ENV_WRONG",
25+
"cloudfoundry:my-cloudant-instance-1"
26+
]
27+
}
2228
},
2329
"AlertNotificationFileWithKey": {
24-
"searchPatterns": [
25-
"file:Tests/CloudEnvironmentTests/resources/config_file_with_key.json:alertnotification",
26-
"env:KUBE_ENV_WRONG",
27-
"cloudfoundry:my-cloudant-instance-1"
28-
]
30+
"credentials": {
31+
"searchPatterns": [
32+
"file:Tests/CloudEnvironmentTests/resources/config_file_with_key.json:alertnotification",
33+
"env:KUBE_ENV_WRONG",
34+
"cloudfoundry:my-cloudant-instance-1"
35+
]
36+
}
2937
},
3038
"CloudantKey": {
31-
"searchPatterns": [
32-
"cloudfoundry:CloudantService",
33-
"env:my-kube-secret-os-credentials",
34-
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
35-
]
39+
"credentials": {
40+
"searchPatterns": [
41+
"cloudfoundry:CloudantService",
42+
"env:my-kube-secret-os-credentials",
43+
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
44+
]
45+
}
3646
},
3747
"PushNotificationKey": {
38-
"searchPatterns": [
39-
"cloudfoundry:PushNotificationService",
40-
"env:my-kube-secret-os-credentials",
41-
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
42-
]
48+
"credentials": {
49+
"searchPatterns": [
50+
"cloudfoundry:PushNotificationService",
51+
"env:my-kube-secret-os-credentials",
52+
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
53+
]
54+
}
4355
},
4456
"ConversationKey": {
45-
"searchPatterns": [
46-
"cloudfoundry:ConversationService",
47-
"env:my-kube-secret-os-credentials",
48-
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
49-
]
57+
"credentials": {
58+
"searchPatterns": [
59+
"cloudfoundry:ConversationService",
60+
"env:my-kube-secret-os-credentials",
61+
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
62+
]
63+
}
5064
},
5165
"NLUKey": {
52-
"searchPatterns": [
53-
"cloudfoundry:NLUService",
54-
"env:my-kube-secret-os-credentials",
55-
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
56-
]
66+
"credentials": {
67+
"searchPatterns": [
68+
"cloudfoundry:NLUService",
69+
"env:my-kube-secret-os-credentials",
70+
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
71+
]
72+
}
5773
},
5874
"AutoScalingKey": {
59-
"searchPatterns": [
60-
"cloudfoundry:AutoScalingService",
61-
"env:my-kube-secret-os-credentials",
62-
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
63-
]
75+
"credentials": {
76+
"searchPatterns": [
77+
"cloudfoundry:AutoScalingService",
78+
"env:my-kube-secret-os-credentials",
79+
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
80+
]
81+
}
6482
},
6583
"AppIDKey": {
66-
"searchPatterns": [
67-
"cloudfoundry:AppIDService",
68-
"env:my-kube-secret-os-credentials",
69-
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
70-
]
84+
"credentials": {
85+
"searchPatterns": [
86+
"cloudfoundry:AppIDService",
87+
"env:my-kube-secret-os-credentials",
88+
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
89+
]
90+
}
7191
},
7292
"RedisKey": {
73-
"searchPatterns": [
74-
"cloudfoundry:RedisService",
75-
"env:my-kube-secret-os-credentials",
76-
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
77-
]
93+
"credentials": {
94+
"searchPatterns": [
95+
"cloudfoundry:RedisService",
96+
"env:my-kube-secret-os-credentials",
97+
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
98+
]
99+
}
78100
},
79101
"MongoDBKey": {
80-
"searchPatterns": [
81-
"cloudfoundry:MongoDBService",
82-
"env:my-kube-secret-os-credentials",
83-
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
84-
]
102+
"credentials": {
103+
"searchPatterns": [
104+
"cloudfoundry:MongoDBService",
105+
"env:my-kube-secret-os-credentials",
106+
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
107+
]
108+
}
85109
},
86110
"PostgreSQLKey": {
87-
"searchPatterns": [
88-
"cloudfoundry:PostgreSQLService",
89-
"env:my-kube-secret-os-credentials",
90-
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
91-
]
111+
"credentials": {
112+
"searchPatterns": [
113+
"cloudfoundry:PostgreSQLService",
114+
"env:my-kube-secret-os-credentials",
115+
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
116+
]
117+
}
92118
},
93119
"MySQLKey": {
94-
"searchPatterns": [
95-
"cloudfoundry:MySQLService",
96-
"env:my-kube-secret-os-credentials",
97-
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
98-
]
120+
"credentials": {
121+
"searchPatterns": [
122+
"cloudfoundry:MySQLService",
123+
"env:my-kube-secret-os-credentials",
124+
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
125+
]
126+
}
99127
},
100128
"DB2Key": {
101-
"searchPatterns": [
102-
"cloudfoundry:DB2Service",
103-
"env:my-kube-secret-os-credentials",
104-
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
105-
]
129+
"credentials": {
130+
"searchPatterns": [
131+
"cloudfoundry:DB2Service",
132+
"env:my-kube-secret-os-credentials",
133+
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
134+
]
135+
}
106136
},
107137
"ObjectStorageKey": {
108-
"searchPatterns": [
109-
"cloudfoundry:ObjectStorageService",
110-
"env:my-kube-secret-os-credentials",
111-
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
112-
]
138+
"credentials": {
139+
"searchPatterns": [
140+
"cloudfoundry:ObjectStorageService",
141+
"env:my-kube-secret-os-credentials",
142+
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
143+
]
144+
}
113145
},
114146
"WeatherCompanyDataKey": {
115-
"searchPatterns": [
116-
"cloudfoundry:WeatherCompanyDataService",
117-
"env:my-kube-secret-os-credentials",
118-
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
119-
]
147+
"credentials": {
148+
"searchPatterns": [
149+
"cloudfoundry:WeatherCompanyDataService",
150+
"env:my-kube-secret-os-credentials",
151+
"file:Tests/CloudEnvironmentTests/resources/config_cf_example.json"
152+
]
153+
}
120154
},
121155
"CloudFunctionsCredentials": {
122-
"searchPatterns": [
156+
"credentials": {
157+
"searchPatterns": [
123158
"file:Tests/CloudEnvironmentTests/resources/config_file_with_key.json:CloudFunctions"
124-
]
125-
}
159+
]
160+
}
161+
}
126162
}

0 commit comments

Comments
 (0)