on develop help sign in
Resolve name conflict with DNS API

I hope this is the right way to do it. The DNS API defines a "ResponseHeader" type which conflicts with the ResponseHeader type from the gogol prelude. I've renamed it to DnsResponseHeader. I regenerated the dns code and this resolves the compilation error.

commit939d55de66571ef6c97113ae99b55cc4911a64e1 authorMichael Xavier <michael@michaelxavier.net> dateThu 20 Dec 2018, 10:26 (8 years ago) parent1ee9ab6
4 files changed+67−67
gen/model/dns/v2beta1/dns-api.json+8−8 gogol-dns/gen/Network/Google/DNS.hs+5−5 gogol-dns/gen/Network/Google/DNS/Types.hs+5−5 gogol-dns/gen/Network/Google/DNS/Types/Product.hs+49−49
gen/model/dns/v2beta1/dns-api.json+8−8
@@ -148,7 +148,7 @@
148148 }
149149 },
150150 "header": {
151− "$ref": "ResponseHeader"
151+ "$ref": "DnsResponseHeader"
152152 },
153153 "kind": {
154154 "type": "string",
@@ -324,7 +324,7 @@
324324 }
325325 },
326326 "header": {
327− "$ref": "ResponseHeader"
327+ "$ref": "DnsResponseHeader"
328328 },
329329 "kind": {
330330 "type": "string",
@@ -434,7 +434,7 @@
434434 "type": "object",
435435 "properties": {
436436 "header": {
437− "$ref": "ResponseHeader"
437+ "$ref": "DnsResponseHeader"
438438 },
439439 "kind": {
440440 "type": "string",
@@ -459,7 +459,7 @@
459459 "type": "object",
460460 "properties": {
461461 "header": {
462− "$ref": "ResponseHeader"
462+ "$ref": "DnsResponseHeader"
463463 }
464464 }
465465 },
@@ -468,7 +468,7 @@
468468 "type": "object",
469469 "properties": {
470470 "header": {
471− "$ref": "ResponseHeader"
471+ "$ref": "DnsResponseHeader"
472472 },
473473 "kind": {
474474 "type": "string",
@@ -687,7 +687,7 @@
687687 "type": "object",
688688 "properties": {
689689 "header": {
690− "$ref": "ResponseHeader"
690+ "$ref": "DnsResponseHeader"
691691 },
692692 "kind": {
693693 "type": "string",
@@ -707,8 +707,8 @@
707707 }
708708 }
709709 },
710− "ResponseHeader": {
711− "id": "ResponseHeader",
710+ "DnsResponseHeader": {
711+ "id": "DnsResponseHeader",
712712 "type": "object",
713713 "description": "Elements common to every response.",
714714 "properties": {
gogol-dns/gen/Network/Google/DNS.hs+5−5
@@ -135,6 +135,11 @@ module Network.Google.DNS
135135 , oZoneContext
136136 , oDNSKeyContext
137137
138+ -- ** DNSResponseHeader
139+ , DNSResponseHeader
140+ , dnsResponseHeader
141+ , drhOperationId
142+
138143 -- ** DNSKeySpec
139144 , DNSKeySpec
140145 , dnsKeySpec
@@ -187,11 +192,6 @@ module Network.Google.DNS
187192 -- ** DNSKeyAlgorithm
188193 , DNSKeyAlgorithm (..)
189194
190− -- ** ResponseHeader
191− , ResponseHeader
192− , responseHeader
193− , rhOperationId
194−
195195 -- ** DNSKeySpecKeyType
196196 , DNSKeySpecKeyType (..)
197197
gogol-dns/gen/Network/Google/DNS/Types.hs+5−5
@@ -81,6 +81,11 @@ module Network.Google.DNS.Types
8181 , oZoneContext
8282 , oDNSKeyContext
8383
84+ -- * DNSResponseHeader
85+ , DNSResponseHeader
86+ , dnsResponseHeader
87+ , drhOperationId
88+
8489 -- * DNSKeySpec
8590 , DNSKeySpec
8691 , dnsKeySpec
@@ -133,11 +138,6 @@ module Network.Google.DNS.Types
133138 -- * DNSKeyAlgorithm
134139 , DNSKeyAlgorithm (..)
135140
136− -- * ResponseHeader
137− , ResponseHeader
138− , responseHeader
139− , rhOperationId
140−
141141 -- * DNSKeySpecKeyType
142142 , DNSKeySpecKeyType (..)
143143
gogol-dns/gen/Network/Google/DNS/Types/Product.hs+49−49
@@ -73,7 +73,7 @@ data DNSKeysListResponse = DNSKeysListResponse'
7373 { _dklrNextPageToken :: !(Maybe Text)
7474 , _dklrDNSKeys :: !(Maybe [DNSKey])
7575 , _dklrKind :: !Text
76− , _dklrHeader :: !(Maybe ResponseHeader)
76+ , _dklrHeader :: !(Maybe DNSResponseHeader)
7777 } deriving (Eq,Show,Data,Typeable,Generic)
7878
7979-- | Creates a value of 'DNSKeysListResponse' with the minimum fields required to make a request.
@@ -122,7 +122,7 @@ dklrDNSKeys
122122dklrKind :: Lens' DNSKeysListResponse Text
123123dklrKind = lens _dklrKind (\ s a -> s{_dklrKind = a})
124124
125−dklrHeader :: Lens' DNSKeysListResponse (Maybe ResponseHeader)
125+dklrHeader :: Lens' DNSKeysListResponse (Maybe DNSResponseHeader)
126126dklrHeader
127127 = lens _dklrHeader (\ s a -> s{_dklrHeader = a})
128128
@@ -153,7 +153,7 @@ data ChangesListResponse = ChangesListResponse'
153153 { _clrNextPageToken :: !(Maybe Text)
154154 , _clrChanges :: !(Maybe [Change])
155155 , _clrKind :: !Text
156− , _clrHeader :: !(Maybe ResponseHeader)
156+ , _clrHeader :: !(Maybe DNSResponseHeader)
157157 } deriving (Eq,Show,Data,Typeable,Generic)
158158
159159-- | Creates a value of 'ChangesListResponse' with the minimum fields required to make a request.
@@ -202,7 +202,7 @@ clrChanges
202202clrKind :: Lens' ChangesListResponse Text
203203clrKind = lens _clrKind (\ s a -> s{_clrKind = a})
204204
205−clrHeader :: Lens' ChangesListResponse (Maybe ResponseHeader)
205+clrHeader :: Lens' ChangesListResponse (Maybe DNSResponseHeader)
206206clrHeader
207207 = lens _clrHeader (\ s a -> s{_clrHeader = a})
208208
@@ -228,7 +228,7 @@ instance ToJSON ChangesListResponse where
228228--
229229-- /See:/ 'managedZonesDeleteResponse' smart constructor.
230230newtype ManagedZonesDeleteResponse = ManagedZonesDeleteResponse'
231− { _mzdrHeader :: Maybe ResponseHeader
231+ { _mzdrHeader :: Maybe DNSResponseHeader
232232 } deriving (Eq,Show,Data,Typeable,Generic)
233233
234234-- | Creates a value of 'ManagedZonesDeleteResponse' with the minimum fields required to make a request.
@@ -243,7 +243,7 @@ managedZonesDeleteResponse =
243243 { _mzdrHeader = Nothing
244244 }
245245
246−mzdrHeader :: Lens' ManagedZonesDeleteResponse (Maybe ResponseHeader)
246+mzdrHeader :: Lens' ManagedZonesDeleteResponse (Maybe DNSResponseHeader)
247247mzdrHeader
248248 = lens _mzdrHeader (\ s a -> s{_mzdrHeader = a})
249249
@@ -447,6 +447,43 @@ instance ToJSON Operation where
447447 ("zoneContext" .=) <$> _oZoneContext,
448448 ("dnsKeyContext" .=) <$> _oDNSKeyContext])
449449
450+-- | Elements common to every response.
451+--
452+-- /See:/ 'dnsResponseHeader' smart constructor.
453+newtype DNSResponseHeader = DNSResponseHeader'
454+ { _drhOperationId :: Maybe Text
455+ } deriving (Eq,Show,Data,Typeable,Generic)
456+
457+-- | Creates a value of 'DNSResponseHeader' with the minimum fields required to make a request.
458+--
459+-- Use one of the following lenses to modify other fields as desired:
460+--
461+-- * 'drhOperationId'
462+dnsResponseHeader
463+ :: DNSResponseHeader
464+dnsResponseHeader =
465+ DNSResponseHeader'
466+ { _drhOperationId = Nothing
467+ }
468+
469+-- | For mutating operation requests that completed successfully. This is the
470+-- client_operation_id if the client specified it, otherwise it is
471+-- generated by the server (output only).
472+drhOperationId :: Lens' DNSResponseHeader (Maybe Text)
473+drhOperationId
474+ = lens _drhOperationId
475+ (\ s a -> s{_drhOperationId = a})
476+
477+instance FromJSON DNSResponseHeader where
478+ parseJSON
479+ = withObject "DNSResponseHeader"
480+ (\ o -> DNSResponseHeader' <$> (o .:? "operationId"))
481+
482+instance ToJSON DNSResponseHeader where
483+ toJSON DNSResponseHeader'{..}
484+ = object
485+ (catMaybes [("operationId" .=) <$> _drhOperationId])
486+
450487-- | Parameters for DnsKey key generation. Used for generating initial keys
451488-- for a new ManagedZone and as default when adding a new DnsKey.
452489--
@@ -840,49 +877,12 @@ instance ToJSON OperationManagedZoneContext where
840877 [("oldValue" .=) <$> _omzcOldValue,
841878 ("newValue" .=) <$> _omzcNewValue])
842879
843−-- | Elements common to every response.
844−--
845−-- /See:/ 'responseHeader' smart constructor.
846−newtype ResponseHeader = ResponseHeader'
847− { _rhOperationId :: Maybe Text
848− } deriving (Eq,Show,Data,Typeable,Generic)
849−
850−-- | Creates a value of 'ResponseHeader' with the minimum fields required to make a request.
851−--
852−-- Use one of the following lenses to modify other fields as desired:
853−--
854−-- * 'rhOperationId'
855−responseHeader
856− :: ResponseHeader
857−responseHeader =
858− ResponseHeader'
859− { _rhOperationId = Nothing
860− }
861−
862−-- | For mutating operation requests that completed successfully. This is the
863−-- client_operation_id if the client specified it, otherwise it is
864−-- generated by the server (output only).
865−rhOperationId :: Lens' ResponseHeader (Maybe Text)
866−rhOperationId
867− = lens _rhOperationId
868− (\ s a -> s{_rhOperationId = a})
869−
870−instance FromJSON ResponseHeader where
871− parseJSON
872− = withObject "ResponseHeader"
873− (\ o -> ResponseHeader' <$> (o .:? "operationId"))
874−
875−instance ToJSON ResponseHeader where
876− toJSON ResponseHeader'{..}
877− = object
878− (catMaybes [("operationId" .=) <$> _rhOperationId])
879−
880880--
881881-- /See:/ 'managedZoneOperationsListResponse' smart constructor.
882882data ManagedZoneOperationsListResponse = ManagedZoneOperationsListResponse'
883883 { _mzolrNextPageToken :: !(Maybe Text)
884884 , _mzolrKind :: !Text
885− , _mzolrHeader :: !(Maybe ResponseHeader)
885+ , _mzolrHeader :: !(Maybe DNSResponseHeader)
886886 , _mzolrOperations :: !(Maybe [Operation])
887887 } deriving (Eq,Show,Data,Typeable,Generic)
888888
@@ -926,7 +926,7 @@ mzolrKind :: Lens' ManagedZoneOperationsListResponse Text
926926mzolrKind
927927 = lens _mzolrKind (\ s a -> s{_mzolrKind = a})
928928
929−mzolrHeader :: Lens' ManagedZoneOperationsListResponse (Maybe ResponseHeader)
929+mzolrHeader :: Lens' ManagedZoneOperationsListResponse (Maybe DNSResponseHeader)
930930mzolrHeader
931931 = lens _mzolrHeader (\ s a -> s{_mzolrHeader = a})
932932
@@ -965,7 +965,7 @@ instance ToJSON ManagedZoneOperationsListResponse
965965data ResourceRecordSetsListResponse = ResourceRecordSetsListResponse'
966966 { _rrslrNextPageToken :: !(Maybe Text)
967967 , _rrslrKind :: !Text
968− , _rrslrHeader :: !(Maybe ResponseHeader)
968+ , _rrslrHeader :: !(Maybe DNSResponseHeader)
969969 , _rrslrRrSets :: !(Maybe [ResourceRecordSet])
970970 } deriving (Eq,Show,Data,Typeable,Generic)
971971
@@ -1009,7 +1009,7 @@ rrslrKind :: Lens' ResourceRecordSetsListResponse Text
10091009rrslrKind
10101010 = lens _rrslrKind (\ s a -> s{_rrslrKind = a})
10111011
1012−rrslrHeader :: Lens' ResourceRecordSetsListResponse (Maybe ResponseHeader)
1012+rrslrHeader :: Lens' ResourceRecordSetsListResponse (Maybe DNSResponseHeader)
10131013rrslrHeader
10141014 = lens _rrslrHeader (\ s a -> s{_rrslrHeader = a})
10151015
@@ -1557,7 +1557,7 @@ instance ToJSON DNSKeyDigest where
15571557data ManagedZonesListResponse = ManagedZonesListResponse'
15581558 { _mzlrNextPageToken :: !(Maybe Text)
15591559 , _mzlrKind :: !Text
1560− , _mzlrHeader :: !(Maybe ResponseHeader)
1560+ , _mzlrHeader :: !(Maybe DNSResponseHeader)
15611561 , _mzlrManagedZones :: !(Maybe [ManagedZone])
15621562 } deriving (Eq,Show,Data,Typeable,Generic)
15631563
@@ -1600,7 +1600,7 @@ mzlrNextPageToken
16001600mzlrKind :: Lens' ManagedZonesListResponse Text
16011601mzlrKind = lens _mzlrKind (\ s a -> s{_mzlrKind = a})
16021602
1603−mzlrHeader :: Lens' ManagedZonesListResponse (Maybe ResponseHeader)
1603+mzlrHeader :: Lens' ManagedZonesListResponse (Maybe DNSResponseHeader)
16041604mzlrHeader
16051605 = lens _mzlrHeader (\ s a -> s{_mzlrHeader = a})
16061606