Skip to content

Commit ff04a31

Browse files
feat(DirectLink): Macsec changes (IBM-Cloud#6220)
* feat: Macsec changes dependency:none * feat: documentation dependency:none * chor: quick fix dependency:none * chor: quick fix dependency:none * chor: addressed comments dependency:none * chor: updated go sdk dependency:none * revert go update * chor: updated go sdk dependency:none * chor: removed version dependency:none * Trigger deployment * chor: removed version field dependency:none * chor: added ATs dependency:none
1 parent 9539474 commit ff04a31

24 files changed

+2332
-369
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/IBM/continuous-delivery-go-sdk/v2 v2.0.2
1818
github.com/IBM/event-notifications-go-admin-sdk v0.14.0
1919
github.com/IBM/eventstreams-go-sdk v1.4.0
20-
github.com/IBM/go-sdk-core/v5 v5.19.1
20+
github.com/IBM/go-sdk-core/v5 v5.20.1
2121
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.3
2222
github.com/IBM/ibm-cos-sdk-go v1.12.2
2323
github.com/IBM/ibm-cos-sdk-go-config/v2 v2.3.0
@@ -27,7 +27,7 @@ require (
2727
github.com/IBM/logs-go-sdk v0.4.0
2828
github.com/IBM/logs-router-go-sdk v1.0.7
2929
github.com/IBM/mqcloud-go-sdk v0.2.0
30-
github.com/IBM/networking-go-sdk v0.51.6
30+
github.com/IBM/networking-go-sdk v0.51.7
3131
github.com/IBM/platform-services-go-sdk v0.81.2
3232
github.com/IBM/project-go-sdk v0.3.5
3333
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ github.com/IBM/go-sdk-core/v5 v5.6.3/go.mod h1:tt/B9rxLkRtglE7pvqLuYikgCXaZFL3bt
126126
github.com/IBM/go-sdk-core/v5 v5.9.5/go.mod h1:YlOwV9LeuclmT/qi/LAK2AsobbAP42veV0j68/rlZsE=
127127
github.com/IBM/go-sdk-core/v5 v5.10.2/go.mod h1:WZPFasUzsKab/2mzt29xPcfruSk5js2ywAPwW4VJjdI=
128128
github.com/IBM/go-sdk-core/v5 v5.17.4/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns=
129-
github.com/IBM/go-sdk-core/v5 v5.19.1 h1:sleVks1O4XjgF4YEGvyDh6PZbP6iZhlTPeDkQc8nWDs=
130-
github.com/IBM/go-sdk-core/v5 v5.19.1/go.mod h1:Q3BYO6iDA2zweQPDGbNTtqft5tDcEpm6RTuqMlPcvbw=
129+
github.com/IBM/go-sdk-core/v5 v5.20.1 h1:dzeyifh1kfRLw8VfAIIS5okZYuqLTqplPZP/Kcsgdlo=
130+
github.com/IBM/go-sdk-core/v5 v5.20.1/go.mod h1:Q3BYO6iDA2zweQPDGbNTtqft5tDcEpm6RTuqMlPcvbw=
131131
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.3 h1:9TZHocmCfgmF8TGVrpP1kFyQbjcqLNW7+bM07lefpKQ=
132132
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.3/go.mod h1:jsYutWlnGysdCNoAk0zoIXb2vfKM9TmMpiUkI4pVuXY=
133133
github.com/IBM/ibm-cos-sdk-go v1.12.2 h1:71A4tDl8u6BZ548h71ecEe7fw5bBA7ECTVqYmeSQWQA=
@@ -147,8 +147,8 @@ github.com/IBM/logs-router-go-sdk v1.0.7 h1:uQjQAAcQdo3XvhY6MC7HakhZaXIUsGfUmKj2
147147
github.com/IBM/logs-router-go-sdk v1.0.7/go.mod h1:tCN2vFgu5xG0ob9iJcxi5M4bJ6mWmu3nhmRPnvlwev0=
148148
github.com/IBM/mqcloud-go-sdk v0.2.0 h1:QOWk8ZGk0QfIL0MOGTKzNdM3Qe0Hk+ifAFtNSFQo5HU=
149149
github.com/IBM/mqcloud-go-sdk v0.2.0/go.mod h1:VZQKMtqmcdXKhmLhLiPuS/UHMs/5yo2tA/nD83cQt9E=
150-
github.com/IBM/networking-go-sdk v0.51.6 h1:7hKoFJOWq4pGenJX5OzIk4LpWKG7HfWw41sYDeX1nDs=
151-
github.com/IBM/networking-go-sdk v0.51.6/go.mod h1:wyEnRnBnROgGmSn5UrryycIrbBujHKXf0PmI1NSwcjY=
150+
github.com/IBM/networking-go-sdk v0.51.7 h1:bZEJeogqri4TGT8vNVQJn/NeTMJVWRMCqBp4zjgFmY0=
151+
github.com/IBM/networking-go-sdk v0.51.7/go.mod h1:N3CxPvzInT58Nref4JI3DLIhPzL10CPiZZwsugw8NV8=
152152
github.com/IBM/platform-services-go-sdk v0.81.2 h1:ZE52eDNiblpIQrsRf5VySi1y3AH6H/KI3eNNKDKdN/g=
153153
github.com/IBM/platform-services-go-sdk v0.81.2/go.mod h1:XOowH+JnIih3FA7uilLVM/9VH7XgCmJ4T/i6eZi7gkw=
154154
github.com/IBM/project-go-sdk v0.3.5 h1:L+YClFUa14foS0B/hOOY9n7sIdsT5/XQicnXOyJSpyM=

ibm/provider/provider.go

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -789,21 +789,24 @@ func Provider() *schema.Provider {
789789

790790
// Added for Direct Link
791791

792-
"ibm_dl_gateways": directlink.DataSourceIBMDLGateways(),
793-
"ibm_dl_offering_speeds": directlink.DataSourceIBMDLOfferingSpeeds(),
794-
"ibm_dl_port": directlink.DataSourceIBMDirectLinkPort(),
795-
"ibm_dl_ports": directlink.DataSourceIBMDirectLinkPorts(),
796-
"ibm_dl_gateway": directlink.DataSourceIBMDLGateway(),
797-
"ibm_dl_locations": directlink.DataSourceIBMDLLocations(),
798-
"ibm_dl_routers": directlink.DataSourceIBMDLRouters(),
799-
"ibm_dl_provider_ports": directlink.DataSourceIBMDirectLinkProviderPorts(),
800-
"ibm_dl_provider_gateways": directlink.DataSourceIBMDirectLinkProviderGateways(),
801-
"ibm_dl_route_reports": directlink.DataSourceIBMDLRouteReports(),
802-
"ibm_dl_route_report": directlink.DataSourceIBMDLRouteReport(),
803-
"ibm_dl_export_route_filters": directlink.DataSourceIBMDLExportRouteFilters(),
804-
"ibm_dl_export_route_filter": directlink.DataSourceIBMDLExportRouteFilter(),
805-
"ibm_dl_import_route_filters": directlink.DataSourceIBMDLImportRouteFilters(),
806-
"ibm_dl_import_route_filter": directlink.DataSourceIBMDLImportRouteFilter(),
792+
"ibm_dl_gateways": directlink.DataSourceIBMDLGateways(),
793+
"ibm_dl_offering_speeds": directlink.DataSourceIBMDLOfferingSpeeds(),
794+
"ibm_dl_port": directlink.DataSourceIBMDirectLinkPort(),
795+
"ibm_dl_ports": directlink.DataSourceIBMDirectLinkPorts(),
796+
"ibm_dl_gateway": directlink.DataSourceIBMDLGateway(),
797+
"ibm_dl_locations": directlink.DataSourceIBMDLLocations(),
798+
"ibm_dl_routers": directlink.DataSourceIBMDLRouters(),
799+
"ibm_dl_provider_ports": directlink.DataSourceIBMDirectLinkProviderPorts(),
800+
"ibm_dl_provider_gateways": directlink.DataSourceIBMDirectLinkProviderGateways(),
801+
"ibm_dl_route_reports": directlink.DataSourceIBMDLRouteReports(),
802+
"ibm_dl_route_report": directlink.DataSourceIBMDLRouteReport(),
803+
"ibm_dl_export_route_filters": directlink.DataSourceIBMDLExportRouteFilters(),
804+
"ibm_dl_export_route_filter": directlink.DataSourceIBMDLExportRouteFilter(),
805+
"ibm_dl_import_route_filters": directlink.DataSourceIBMDLImportRouteFilters(),
806+
"ibm_dl_import_route_filter": directlink.DataSourceIBMDLImportRouteFilter(),
807+
"ibm_dl_gateway_macsec_config": directlink.DataSourceIBMDLGatewayMacsecConfig(),
808+
"ibm_dl_gateway_macsec_cak": directlink.DataSourceIBMDLGatewayMacsecCak(),
809+
"ibm_dl_gateway_macsec_caks": directlink.DataSourceIBMDLGatewayMacsecCaks(),
807810

808811
// Added for Transit Gateway
809812
"ibm_tg_gateway": transitgateway.DataSourceIBMTransitGateway(),
@@ -1487,11 +1490,13 @@ func Provider() *schema.Provider {
14871490
"ibm_dns_linked_zone": dnsservices.ResourceIBMDNSLinkedZone(),
14881491

14891492
// Direct Link related resources
1490-
"ibm_dl_gateway": directlink.ResourceIBMDLGateway(),
1491-
"ibm_dl_virtual_connection": directlink.ResourceIBMDLGatewayVC(),
1492-
"ibm_dl_provider_gateway": directlink.ResourceIBMDLProviderGateway(),
1493-
"ibm_dl_route_report": directlink.ResourceIBMDLGatewayRouteReport(),
1494-
"ibm_dl_gateway_action": directlink.ResourceIBMDLGatewayAction(),
1493+
"ibm_dl_gateway": directlink.ResourceIBMDLGateway(),
1494+
"ibm_dl_virtual_connection": directlink.ResourceIBMDLGatewayVC(),
1495+
"ibm_dl_provider_gateway": directlink.ResourceIBMDLProviderGateway(),
1496+
"ibm_dl_route_report": directlink.ResourceIBMDLGatewayRouteReport(),
1497+
"ibm_dl_gateway_action": directlink.ResourceIBMDLGatewayAction(),
1498+
"ibm_dl_gateway_macsec_config": directlink.ResourceIBMDLGatewayMacsecConfig(),
1499+
"ibm_dl_gateway_macsec_cak": directlink.ResourceIBMDLGatewayMacsecCak(),
14951500

14961501
// Added for Transit Gateway
14971502
"ibm_tg_gateway": transitgateway.ResourceIBMTransitGateway(),
@@ -1975,6 +1980,7 @@ func Validator() validate.ValidatorDict {
19751980
"ibm_dl_gateway": directlink.ResourceIBMDLGatewayValidator(),
19761981
"ibm_dl_provider_gateway": directlink.ResourceIBMDLProviderGatewayValidator(),
19771982
"ibm_dl_gateway_action": directlink.ResourceIBMDLGatewayActionValidator(),
1983+
"ibm_dl_gateway_macsec_cak": directlink.ResourceIBMdlGatewayMacsecCakValidator(),
19781984
"ibm_database": database.ResourceIBMICDValidator(),
19791985
"ibm_function_package": functions.ResourceIBMFuncPackageValidator(),
19801986
"ibm_function_action": functions.ResourceIBMFuncActionValidator(),

ibm/service/directlink/constants.go

Lines changed: 121 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -4,106 +4,127 @@
44
package directlink
55

66
const (
7-
dlGatewaysVirtualConnections = "gateway_vcs"
8-
dlVCNetworkAccount = "network_account"
9-
dlVCNetworkId = "network_id"
10-
dlVCName = "name"
11-
dlVCType = "type"
12-
dlVCCreatedAt = "created_at"
13-
dlVCStatus = "status"
14-
dlGatewayId = "gateway"
15-
ID = "id"
16-
dlVirtualConnectionId = "virtual_connection_id"
17-
dlVirtualConnectionName = "virtual_connection_name"
18-
dlVirtualConnectionType = "virtual_connection_type"
19-
dlActive = "active"
20-
dlAsPath = "as_path"
21-
dlAdvertisedRoutes = "advertised_routes"
22-
dlAsPrepends = "as_prepends"
23-
dlAuthenticationKey = "authentication_key"
24-
dlBfdInterval = "bfd_interval"
25-
dlBfdMultiplier = "bfd_multiplier"
26-
dlBfdStatus = "bfd_status"
27-
dlBfdStatusUpdatedAt = "bfd_status_updated_at"
28-
dlBgpAsn = "bgp_asn"
29-
dlBgpBaseCidr = "bgp_base_cidr"
30-
dlBgpCerCidr = "bgp_cer_cidr"
31-
dlBgpIbmAsn = "bgp_ibm_asn"
32-
dlBgpIbmCidr = "bgp_ibm_cidr"
33-
dlBgpStatus = "bgp_status"
34-
dlBgpStatusUpdatedAt = "bgp_status_updated_at"
35-
dlCarrierName = "carrier_name"
36-
dlChangeRequest = "change_request"
37-
dlCipherSuite = "cipher_suite"
38-
dlCompletionNoticeRejectReason = "completion_notice_reject_reason"
39-
dlConfidentialityOffset = "confidentiality_offset"
40-
dlGatewayProvisioning = "configuring"
41-
dlConnectionMode = "connection_mode"
42-
dlCreatedAt = "created_at"
43-
dlGatewayProvisioningRejected = "create_rejected"
44-
dlCrossConnectRouter = "cross_connect_router"
45-
dlCrn = "crn"
46-
dlCryptographicAlgorithm = "cryptographic_algorithm"
47-
dlCustomerName = "customer_name"
48-
dlFallbackCak = "fallback_cak"
49-
dlGlobal = "global"
50-
dlKeyServerPriority = "key_server_priority"
51-
dlLength = "length"
52-
dlLoaRejectReason = "loa_reject_reason"
53-
dlLocalPreference = "local_preference"
54-
dlLocationDisplayName = "location_display_name"
55-
dlLocationName = "location_name"
56-
dlLinkStatus = "link_status"
57-
dlLinkStatusUpdatedAt = "link_status_updated_at"
58-
dlMacSecConfig = "macsec_config"
59-
dlMetered = "metered"
60-
dlName = "name"
61-
dlOperationalStatus = "operational_status"
62-
dlPolicy = "policy"
63-
dlPort = "port"
64-
dlPrimaryCak = "primary_cak"
65-
dlProviderAPIManaged = "provider_api_managed"
66-
dlGatewayProvisioningDone = "provisioned"
67-
dlResourceGroup = "resource_group"
68-
dlSakExpiryTime = "sak_expiry_time"
69-
dlSpeedMbps = "speed_mbps"
70-
dlMacSecConfigStatus = "status"
71-
dlTags = "tags"
72-
dlType = "type"
73-
dlUpdatedAt = "updated_at"
74-
dlVlan = "vlan"
75-
dlRemoveVlan = "remove_vlan"
76-
dlWindowSize = "window_size"
77-
customerAccountID = "customer_account_id"
78-
dlRouteReports = "route_reports"
79-
dlPrefix = "prefix"
80-
dlRouteReportNextHop = "next_hop"
81-
dlGatewayRoutes = "gateway_routes"
82-
dlOnPremRoutes = "on_prem_routes"
83-
dlOverlappingRoutes = "overlapping_routes"
84-
dlRoutes = "routes"
85-
dlRouteReportStatus = "status"
86-
dlVirtualConnectionRoutes = "virtual_connection_routes"
87-
dlId = "id"
88-
dlRouteReportPending = "pending"
89-
dlRouteReportComplete = "complete"
90-
dlRouteReportId = "route_report_id"
91-
dlResourceId = "id"
92-
dlExportRouteFilters = "export_route_filters"
93-
dlImportRouteFilters = "import_route_filters"
94-
dlAction = "action"
95-
dlBefore = "before"
96-
dlGe = "ge"
97-
dlLe = "le"
98-
dlExportRouteFilterId = "ex_filter_id"
99-
dlImportRouteFilterId = "im_filter_id"
100-
dlDefault_export_route_filter = "default_export_route_filter"
101-
dlDefault_import_route_filter = "default_import_route_filter"
102-
dlCustomerAction = "action"
103-
dlGatewayActionUpdate = "actionupdate"
104-
dlGatewayActionUpdateDone = "actionupdatedone"
105-
dlGatewayDeleteActionUpdate = "deleteAction"
106-
dlGatewayDeleteActionUpdateDone = "deleteActiondone"
7+
dlGatewaysVirtualConnections = "gateway_vcs"
8+
dlVCNetworkAccount = "network_account"
9+
dlVCNetworkId = "network_id"
10+
dlVCName = "name"
11+
dlVCType = "type"
12+
dlVCCreatedAt = "created_at"
13+
dlVCStatus = "status"
14+
dlGatewayId = "gateway"
15+
ID = "id"
16+
dlVirtualConnectionId = "virtual_connection_id"
17+
dlVirtualConnectionName = "virtual_connection_name"
18+
dlVirtualConnectionType = "virtual_connection_type"
19+
dlActive = "active"
20+
dlAsPath = "as_path"
21+
dlAdvertisedRoutes = "advertised_routes"
22+
dlAsPrepends = "as_prepends"
23+
dlAuthenticationKey = "authentication_key"
24+
dlBfdInterval = "bfd_interval"
25+
dlBfdMultiplier = "bfd_multiplier"
26+
dlBfdStatus = "bfd_status"
27+
dlBfdStatusUpdatedAt = "bfd_status_updated_at"
28+
dlBgpAsn = "bgp_asn"
29+
dlBgpBaseCidr = "bgp_base_cidr"
30+
dlBgpCerCidr = "bgp_cer_cidr"
31+
dlBgpIbmAsn = "bgp_ibm_asn"
32+
dlBgpIbmCidr = "bgp_ibm_cidr"
33+
dlBgpStatus = "bgp_status"
34+
dlBgpStatusUpdatedAt = "bgp_status_updated_at"
35+
dlCarrierName = "carrier_name"
36+
dlChangeRequest = "change_request"
37+
dlCipherSuite = "cipher_suite"
38+
dlCompletionNoticeRejectReason = "completion_notice_reject_reason"
39+
dlConfidentialityOffset = "confidentiality_offset"
40+
dlGatewayProvisioning = "configuring"
41+
dlConnectionMode = "connection_mode"
42+
dlCreatedAt = "created_at"
43+
dlGatewayProvisioningRejected = "create_rejected"
44+
dlCrossConnectRouter = "cross_connect_router"
45+
dlCrn = "crn"
46+
dlCryptographicAlgorithm = "cryptographic_algorithm"
47+
dlCustomerName = "customer_name"
48+
dlFallbackCak = "fallback_cak"
49+
dlGlobal = "global"
50+
dlKeyServerPriority = "key_server_priority"
51+
dlLength = "length"
52+
dlLoaRejectReason = "loa_reject_reason"
53+
dlLocalPreference = "local_preference"
54+
dlLocationDisplayName = "location_display_name"
55+
dlLocationName = "location_name"
56+
dlLinkStatus = "link_status"
57+
dlLinkStatusUpdatedAt = "link_status_updated_at"
58+
dlMacSecConfig = "macsec_config"
59+
dlMetered = "metered"
60+
dlName = "name"
61+
dlOperationalStatus = "operational_status"
62+
dlPolicy = "policy"
63+
dlPort = "port"
64+
dlPrimaryCak = "primary_cak"
65+
dlProviderAPIManaged = "provider_api_managed"
66+
dlGatewayProvisioningDone = "provisioned"
67+
dlResourceGroup = "resource_group"
68+
dlSakExpiryTime = "sak_expiry_time"
69+
dlSpeedMbps = "speed_mbps"
70+
dlMacSecConfigStatus = "status"
71+
dlTags = "tags"
72+
dlType = "type"
73+
dlUpdatedAt = "updated_at"
74+
dlVlan = "vlan"
75+
dlRemoveVlan = "remove_vlan"
76+
dlWindowSize = "window_size"
77+
customerAccountID = "customer_account_id"
78+
dlRouteReports = "route_reports"
79+
dlPrefix = "prefix"
80+
dlRouteReportNextHop = "next_hop"
81+
dlGatewayRoutes = "gateway_routes"
82+
dlOnPremRoutes = "on_prem_routes"
83+
dlOverlappingRoutes = "overlapping_routes"
84+
dlRoutes = "routes"
85+
dlRouteReportStatus = "status"
86+
dlVirtualConnectionRoutes = "virtual_connection_routes"
87+
dlId = "id"
88+
dlRouteReportPending = "pending"
89+
dlRouteReportComplete = "complete"
90+
dlRouteReportId = "route_report_id"
91+
dlResourceId = "id"
92+
dlExportRouteFilters = "export_route_filters"
93+
dlImportRouteFilters = "import_route_filters"
94+
dlAction = "action"
95+
dlBefore = "before"
96+
dlGe = "ge"
97+
dlLe = "le"
98+
dlExportRouteFilterId = "ex_filter_id"
99+
dlImportRouteFilterId = "im_filter_id"
100+
dlDefault_export_route_filter = "default_export_route_filter"
101+
dlDefault_import_route_filter = "default_import_route_filter"
102+
dlCustomerAction = "action"
103+
dlGatewayActionUpdate = "actionupdate"
104+
dlGatewayActionUpdateDone = "actionupdatedone"
105+
dlGatewayDeleteActionUpdate = "deleteAction"
106+
dlGatewayDeleteActionUpdateDone = "deleteActiondone"
107+
dlGatewaySakRekey = "sak_rekey"
108+
dlGatewaySakRekeyTimerMode = "sak_rekey_timer_mode"
109+
dlGatewaySakRekeyPacketNumberRolloverMode = "sak_rekey_packet_mode"
110+
dlGatewaySakRekeyInterval = "interval"
111+
dlGatewaySakRekeyMode = "mode"
112+
dlGatewayMacsecStatusReasons = "status_reasons"
113+
dlGatewayMacsecSatusReason = "status_reason"
114+
115+
dlGatewayMacsecSatusReasonCode = "code"
116+
dlGatewayMacsecSatusReasonMessage = "message"
117+
dlGatewayMacsecSatusReasonMoreInfo = "more_info"
118+
119+
dlGatewayMacsecCaksList = "caks"
120+
dlGatewayMacsecCak = "cak"
121+
dlGatewayMacsecCakID = "cak_id"
122+
dlGatewayMacsecCakName = "name"
123+
dlGatewayMacsecCakSession = "session"
124+
dlGatewayMacsecCakStatus = "status"
125+
dlGatewayMacsecHPCSKey = "key"
126+
dlGatewayMacsecHPCSCrn = "crn"
127+
dlGatewayMacsecCakActiveDelta = "active_delta"
107128
)
108129

109130
func NewInt64Pointer(v int64) *int64 {

0 commit comments

Comments
 (0)