Skip to content

Commit

Permalink
Removed Logs Router Provider
Browse files Browse the repository at this point in the history
Signed-off-by: Ian Reyes <[email protected]>
  • Loading branch information
ianre committed Dec 11, 2023
1 parent 1bb8e05 commit f0b89e1
Show file tree
Hide file tree
Showing 18 changed files with 9 additions and 874 deletions.
18 changes: 9 additions & 9 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "go.mod|go.sum|.*.map|^.secrets.baseline$",
"lines": null
},
"generated_at": "2023-12-05T09:48:48Z",
"generated_at": "2023-12-11T01:02:37Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -786,47 +786,47 @@
"hashed_secret": "9184b0c38101bf24d78b2bb0d044deb1d33696fc",
"is_secret": false,
"is_verified": false,
"line_number": 132,
"line_number": 131,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "c427f185ddcb2440be9b77c8e45f1cd487a2e790",
"is_secret": false,
"is_verified": false,
"line_number": 1450,
"line_number": 1438,
"type": "Base64 High Entropy String",
"verified_result": null
},
{
"hashed_secret": "1f7e33de15e22de9d2eaf502df284ed25ca40018",
"is_secret": false,
"is_verified": false,
"line_number": 1517,
"line_number": 1505,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "1f614c2eb6b3da22d89bd1b9fd47d7cb7c8fc670",
"is_secret": false,
"is_verified": false,
"line_number": 3326,
"line_number": 3298,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "7abfce65b8504403afc25c9790f358d513dfbcc6",
"is_secret": false,
"is_verified": false,
"line_number": 3339,
"line_number": 3311,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "0c2d85bf9a9b1579b16f220a4ea8c3d62b2e24b1",
"is_secret": false,
"is_verified": false,
"line_number": 3380,
"line_number": 3352,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -864,15 +864,15 @@
"hashed_secret": "c8b6f5ef11b9223ac35a5663975a466ebe7ebba9",
"is_secret": false,
"is_verified": false,
"line_number": 1815,
"line_number": 1807,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "8abf4899c01104241510ba87685ad4de76b0c437",
"is_secret": false,
"is_verified": false,
"line_number": 1821,
"line_number": 1813,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down
81 changes: 0 additions & 81 deletions examples/ibm-logs-router/README.md

This file was deleted.

17 changes: 0 additions & 17 deletions examples/ibm-logs-router/main.tf

This file was deleted.

6 changes: 0 additions & 6 deletions examples/ibm-logs-router/outputs.tf

This file was deleted.

33 changes: 0 additions & 33 deletions examples/ibm-logs-router/variables.tf

This file was deleted.

9 changes: 0 additions & 9 deletions examples/ibm-logs-router/versions.tf

This file was deleted.

1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ require (
github.com/IBM/ibm-hpcs-tke-sdk v0.0.0-20211109141421-a4b61b05f7d1
github.com/IBM/ibm-hpcs-uko-sdk v0.0.20-beta
github.com/IBM/keyprotect-go-client v0.12.2
github.com/IBM/logs-router-go-sdk v1.0.0
github.com/IBM/networking-go-sdk v0.42.2
github.com/IBM/platform-services-go-sdk v0.54.0
github.com/IBM/project-go-sdk v0.1.4
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,6 @@ github.com/IBM/ibm-hpcs-uko-sdk v0.0.20-beta/go.mod h1:MLVNHMYoKsvovJZ4v1gQCpIYt
github.com/IBM/keyprotect-go-client v0.5.1/go.mod h1:5TwDM/4FRJq1ZOlwQL1xFahLWQ3TveR88VmL1u3njyI=
github.com/IBM/keyprotect-go-client v0.12.2 h1:Cjxcqin9Pl0xz3MnxdiVd4v/eIa79xL3hQpSbwOr/DQ=
github.com/IBM/keyprotect-go-client v0.12.2/go.mod h1:yr8h2noNgU8vcbs+vhqoXp3Lmv73PI0zAc6VMgFvWwM=
github.com/IBM/logs-router-go-sdk v1.0.0 h1:cGBjf7wJye/WuzFljqN7yB8ToIxLIiffWaQGW9rSTcI=
github.com/IBM/logs-router-go-sdk v1.0.0/go.mod h1:FJpyZctp5DmRms/MtvRUuWBF/CAk76WJzAsJc4EIM/Y=
github.com/IBM/networking-go-sdk v0.42.2 h1:caqjx4jyFHi10Vlf3skHvlL6K3YJRVstsmCBmvdyqkA=
github.com/IBM/networking-go-sdk v0.42.2/go.mod h1:lTUZwtUkMANMnrLHFIgRhHrkBfwASY/Iho1fabaPHxo=
github.com/IBM/platform-services-go-sdk v0.54.0 h1:WjHWm9ZAJvlq07E1WXXtEe+d/B0sazWD6cEWVT7EMLU=
Expand Down
28 changes: 0 additions & 28 deletions ibm/conns/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"github.com/IBM/go-sdk-core/v5/core"
cosconfig "github.com/IBM/ibm-cos-sdk-go-config/resourceconfigurationv1"
kp "github.com/IBM/keyprotect-go-client"
"github.com/IBM/logs-router-go-sdk/ibmlogsrouteropenapi30v0"
cisalertsv1 "github.com/IBM/networking-go-sdk/alertsv1"
cisoriginpull "github.com/IBM/networking-go-sdk/authenticatedoriginpullapiv1"
cisbotanalyticsv1 "github.com/IBM/networking-go-sdk/botanalyticsv1"
Expand Down Expand Up @@ -229,7 +228,6 @@ type ClientSession interface {
ResourceManagementAPIv2() (managementv2.ResourceManagementAPIv2, error)
ResourceControllerAPI() (controller.ResourceControllerAPI, error)
ResourceControllerAPIV2() (controllerv2.ResourceControllerAPIV2, error)
IbmLogsRouterOpenApi30V0() (*ibmlogsrouteropenapi30v0.IbmLogsRouterOpenApi30V0, error)
SoftLayerSession() *slsession.Session
IBMPISession() (*ibmpisession.IBMPISession, error)
UserManagementAPI() (usermanagementv2.UserManagementAPI, error)
Expand Down Expand Up @@ -544,10 +542,6 @@ type clientSession struct {
secretsManagerClient *secretsmanagerv2.SecretsManagerV2
secretsManagerClientErr error

// Logs Routing
ibmLogsRouterOpenApi30Client *ibmlogsrouteropenapi30v0.IbmLogsRouterOpenApi30V0
ibmLogsRouterOpenApi30ClientErr error

// Schematics service options
schematicsClient *schematicsv1.SchematicsV1
schematicsClientErr error
Expand Down Expand Up @@ -1175,11 +1169,6 @@ func (session clientSession) MetricsRouterV3() (*metricsrouterv3.MetricsRouterV3
return session.metricsRouterClient, session.metricsRouterClientErr
}

// Logs Router API
func (session clientSession) IbmLogsRouterOpenApi30V0() (*ibmlogsrouteropenapi30v0.IbmLogsRouterOpenApi30V0, error) {
return session.ibmLogsRouterOpenApi30Client, session.ibmLogsRouterOpenApi30ClientErr
}

func (session clientSession) ESschemaRegistrySession() (*schemaregistryv1.SchemaregistryV1, error) {
return session.esSchemaRegistryClient, session.esSchemaRegistryErr
}
Expand Down Expand Up @@ -1307,7 +1296,6 @@ func (c *Config) ClientSession() (interface{}, error) {
session.cdToolchainClientErr = errEmptyBluemixCredentials
session.codeEngineClientErr = errEmptyBluemixCredentials
session.projectClientErr = errEmptyBluemixCredentials
session.ibmLogsRouterOpenApi30ClientErr = errEmptyBluemixCredentials

return session, nil
}
Expand Down Expand Up @@ -1690,22 +1678,6 @@ func (c *Config) ClientSession() (interface{}, error) {
})
}

// LOGS ROUTER service
ibmLogsRouterOpenApi30ClientOptions := &ibmlogsrouteropenapi30v0.IbmLogsRouterOpenApi30V0Options{
Authenticator: authenticator,
}
session.ibmLogsRouterOpenApi30Client, err = ibmlogsrouteropenapi30v0.NewIbmLogsRouterOpenApi30V0(ibmLogsRouterOpenApi30ClientOptions)
if err == nil {
// Enable retries for API calls
session.ibmLogsRouterOpenApi30Client.Service.EnableRetries(c.RetryCount, c.RetryDelay)
// Add custom header for analytics
session.ibmLogsRouterOpenApi30Client.SetDefaultHeaders(gohttp.Header{
"X-Original-User-Agent": {fmt.Sprintf("terraform-provider-ibm/%s", version.Version)},
})
} else {
session.ibmLogsRouterOpenApi30ClientErr = fmt.Errorf("Error occurred while configuring IBM logs-router service: %q", err)
}

// ATRACKER Version 2
var atrackerClientV2URL string
var atrackerURLV2Err error
Expand Down
8 changes: 0 additions & 8 deletions ibm/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import (
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/iampolicy"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/kms"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/kubernetes"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/logsrouter"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/metricsrouter"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/power"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/project"
Expand Down Expand Up @@ -744,9 +743,6 @@ func Provider() *schema.Provider {
"ibm_metrics_router_targets": metricsrouter.DataSourceIBMMetricsRouterTargets(),
"ibm_metrics_router_routes": metricsrouter.DataSourceIBMMetricsRouterRoutes(),

// Logs Router
"ibm_logs_router_tenant": logsrouter.DataSourceIbmLogsRouterTenant(),

// Security and Complaince Center(soon to be deprecated)
"ibm_scc_account_location": scc.DataSourceIBMSccAccountLocation(),
"ibm_scc_account_locations": scc.DataSourceIBMSccAccountLocations(),
Expand Down Expand Up @@ -1280,9 +1276,6 @@ func Provider() *schema.Provider {
"ibm_metrics_router_route": metricsrouter.ResourceIBMMetricsRouterRoute(),
"ibm_metrics_router_settings": metricsrouter.ResourceIBMMetricsRouterSettings(),

// Logs Router
"ibm_logs_router_tenant": logsrouter.ResourceIbmLogsRouterTenant(),

// Security and Compliance Center(soon to be deprecated)
"ibm_scc_account_settings": scc.ResourceIBMSccAccountSettings(),
"ibm_scc_rule_attachment": scc.ResourceIBMSccRuleAttachment(),
Expand Down Expand Up @@ -1547,7 +1540,6 @@ func Validator() validate.ValidatorDict {
"ibm_metrics_router_target": metricsrouter.ResourceIBMMetricsRouterTargetValidator(),
"ibm_metrics_router_route": metricsrouter.ResourceIBMMetricsRouterRouteValidator(),
"ibm_metrics_router_settings": metricsrouter.ResourceIBMMetricsRouterSettingsValidator(),
"ibm_logs_router_tenant": logsrouter.ResourceIbmLogsRouterTenantValidator(),
"ibm_satellite_endpoint": satellite.ResourceIBMSatelliteEndpointValidator(),
"ibm_cbr_zone": contextbasedrestrictions.ResourceIBMCbrZoneValidator(),
"ibm_cbr_rule": contextbasedrestrictions.ResourceIBMCbrRuleValidator(),
Expand Down
11 changes: 0 additions & 11 deletions ibm/service/logsrouter/README.md

This file was deleted.

Loading

0 comments on commit f0b89e1

Please sign in to comment.