Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CIS: Domain Settings development #1939

Merged
merged 7 commits into from
Oct 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/ibm-cis/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ data "ibm_cis_edge_functions_triggers" "test_triggers" {

- User has IAM security rights to create and configure an Internet Services instance
- DNS Domain registration
- [Domain Settings](https://cloud.ibm.com/docs/cis-cli-plugin?topic=cis-cli-plugin-cis-cli#domain-settings)
- [DNS Record CLI](https://cloud.ibm.com/docs/cis-cli-plugin?topic=cis-cli-plugin-cis-cli#dns-record)
- [GLB CLI](https://cloud.ibm.com/docs/cis-cli-plugin?topic=cis-cli-plugin-cis-cli#glb)
- [Firewall CLI](https://cloud.ibm.com/docs/cis-cli-plugin?topic=cis-cli-plugin-cis-cli#firewall)
Expand Down
6 changes: 5 additions & 1 deletion examples/ibm-cis/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,8 @@ output "ibm_cis_edge_functions_action_output" {

output "ibm_cis_edge_function_trigger_output" {
value = ibm_cis_edge_functions_trigger.test_trigger
}
}

output "domain_setting" {
value = ibm_cis_domain_settings.test_domain_settings
}
125 changes: 5 additions & 120 deletions go.sum

Large diffs are not rendered by default.

55 changes: 55 additions & 0 deletions ibm/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ import (
cisdnsrecordsv1 "github.com/IBM/networking-go-sdk/dnsrecordsv1"
cisedgefunctionv1 "github.com/IBM/networking-go-sdk/edgefunctionsapiv1"
cisglbhealthcheckv1 "github.com/IBM/networking-go-sdk/globalloadbalancermonitorv1"
cissslv1 "github.com/IBM/networking-go-sdk/sslcertificateapiv1"
tg "github.com/IBM/networking-go-sdk/transitgatewayapisv1"
cisratelimitv1 "github.com/IBM/networking-go-sdk/zoneratelimitsv1"
cisdomainsettingsv1 "github.com/IBM/networking-go-sdk/zonessettingsv1"
ciszonesv1 "github.com/IBM/networking-go-sdk/zonesv1"
vpcclassic "github.com/IBM/vpc-go-sdk/vpcclassicv1"
vpc "github.com/IBM/vpc-go-sdk/vpcv1"
Expand Down Expand Up @@ -191,6 +193,8 @@ type ClientSession interface {
CisGLBHealthCheckClientSession() (*cisglbhealthcheckv1.GlobalLoadBalancerMonitorV1, error)
CisRLClientSession() (*cisratelimitv1.ZoneRateLimitsV1, error)
CisEdgeFunctionClientSession() (*cisedgefunctionv1.EdgeFunctionsApiV1, error)
CisSSLClientSession() (*cissslv1.SslCertificateApiV1, error)
CisDomainSettingsClientSession() (*cisdomainsettingsv1.ZonesSettingsV1, error)
}

type clientSession struct {
Expand Down Expand Up @@ -326,6 +330,14 @@ type clientSession struct {
// CIS Edge Functions service options
cisEdgeFunctionErr error
cisEdgeFunctionClient *cisedgefunctionv1.EdgeFunctionsApiV1

// CIS SSL certificate service options
cisSSLErr error
cisSSLClient *cissslv1.SslCertificateApiV1

// CIS Zone Setting service options
cisDomainSettingsErr error
cisDomainSettingsClient *cisdomainsettingsv1.ZonesSettingsV1
}

// BluemixAcccountAPI ...
Expand Down Expand Up @@ -539,6 +551,16 @@ func (sess clientSession) CisEdgeFunctionClientSession() (*cisedgefunctionv1.Edg
return sess.cisEdgeFunctionClient, sess.cisEdgeFunctionErr
}

// CIS SSL certificate
func (sess clientSession) CisSSLClientSession() (*cissslv1.SslCertificateApiV1, error) {
return sess.cisSSLClient, sess.cisSSLErr
}

// CIS Zone Settings
func (sess clientSession) CisDomainSettingsClientSession() (*cisdomainsettingsv1.ZonesSettingsV1, error) {
return sess.cisDomainSettingsClient, sess.cisDomainSettingsErr
}

// ClientSession configures and returns a fully initialized ClientSession
func (c *Config) ClientSession() (interface{}, error) {
sess, err := newSession(c)
Expand Down Expand Up @@ -596,6 +618,8 @@ func (c *Config) ClientSession() (interface{}, error) {
session.cisZonesErr = errEmptyBluemixCredentials
session.cisRLErr = errEmptyBluemixCredentials
session.cisEdgeFunctionErr = errEmptyBluemixCredentials
session.cisSSLErr = errEmptyBluemixCredentials
session.cisDomainSettingsErr = errEmptyBluemixCredentials

return session, nil
}
Expand Down Expand Up @@ -991,6 +1015,37 @@ func (c *Config) ClientSession() (interface{}, error) {
fmt.Errorf("Error occured while configuring CIS Edge Function service: %s",
session.cisEdgeFunctionErr)
}

// IBM Network CIS SSL certificate
cisSSLOpt := &cissslv1.SslCertificateApiV1Options{
URL: cisEndPoint,
Crn: core.StringPtr(""),
ZoneIdentifier: core.StringPtr(""),
Authenticator: authenticator,
}

// IBM Network CIS Edge Function
session.cisSSLClient, session.cisSSLErr = cissslv1.NewSslCertificateApiV1(cisSSLOpt)
if session.cisSSLErr != nil {
session.cisSSLErr =
fmt.Errorf("Error occured while configuring CIS SSL certificate service: %s",
session.cisSSLErr)
}

// IBM Network CIS Domain settings
cisDomainSettingsOpt := &cisdomainsettingsv1.ZonesSettingsV1Options{
URL: cisEndPoint,
Crn: core.StringPtr(""),
ZoneIdentifier: core.StringPtr(""),
Authenticator: authenticator,
}
session.cisDomainSettingsClient, session.cisDomainSettingsErr =
cisdomainsettingsv1.NewZonesSettingsV1(cisDomainSettingsOpt)
if session.cisSSLErr != nil {
session.cisSSLErr =
fmt.Errorf("Error occured while configuring CIS SSL certificate service: %s",
session.cisSSLErr)
}
return session, nil
}

Expand Down
1 change: 1 addition & 0 deletions ibm/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,7 @@ func Validator() ValidatorDict {
"ibm_iam_custom_role": resourceIBMIAMCustomRoleValidator(),
"ibm_cis_healthcheck": resourceIBMCISHealthCheckValidator(),
"ibm_cis_rate_limit": resourceIBMCISRateLimitValidator(),
"ibm_cis_domain_settings": resourceIBMCISDomainSettingValidator(),
"ibm_tg_gateway": resourceIBMTGValidator(),
"ibm_tg_connection": resourceIBMTransitGatewayConnectionValidator(),
"ibm_dl_virtual_connection": resourceIBMdlGatewayVCValidator(),
Expand Down
Loading