-
Notifications
You must be signed in to change notification settings - Fork 288
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
openapi(dm): support config relay when create source (#3600)
- Loading branch information
Showing
7 changed files
with
319 additions
and
140 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| // Copyright 2021 PingCAP, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package config | ||
|
|
||
| import ( | ||
| "github.com/pingcap/ticdc/dm/openapi" | ||
| ) | ||
|
|
||
| // SourceCfgToOpenAPISource converter SourceConfig to openapi.Source. | ||
| func SourceCfgToOpenAPISource(cfg *SourceConfig) openapi.Source { | ||
| source := openapi.Source{ | ||
| EnableGtid: cfg.EnableGTID, | ||
| Host: cfg.From.Host, | ||
| Password: "******", // PM's requirement, we always return obfuscated password to user | ||
| Port: cfg.From.Port, | ||
| SourceName: cfg.SourceID, | ||
| User: cfg.From.User, | ||
| Purge: &openapi.Purge{ | ||
| Expires: &cfg.Purge.Expires, | ||
| Interval: &cfg.Purge.Interval, | ||
| RemainSpace: &cfg.Purge.RemainSpace, | ||
| }, | ||
| RelayConfig: &openapi.RelayConfig{ | ||
| EnableRelay: &cfg.EnableRelay, | ||
| RelayBinlogGtid: &cfg.RelayBinlogGTID, | ||
| RelayBinlogName: &cfg.RelayBinLogName, | ||
| RelayDir: &cfg.RelayDir, | ||
| }, | ||
| } | ||
| if cfg.From.Security != nil { | ||
| // NOTE we don't return security content here, because we don't want to expose it to the user. | ||
| var certAllowedCn []string | ||
| certAllowedCn = append(certAllowedCn, cfg.From.Security.CertAllowedCN...) | ||
| source.Security = &openapi.Security{CertAllowedCn: &certAllowedCn} | ||
| } | ||
| return source | ||
| } | ||
|
|
||
| // OpenAPISourceToSourceCfg converter openapi.Source to SourceConfig. | ||
| func OpenAPISourceToSourceCfg(source openapi.Source) *SourceConfig { | ||
| cfg := NewSourceConfig() | ||
| from := DBConfig{ | ||
| Host: source.Host, | ||
| Port: source.Port, | ||
| User: source.User, | ||
| Password: source.Password, | ||
| } | ||
| if source.Security != nil { | ||
| from.Security = &Security{ | ||
| SSLCABytes: []byte(source.Security.SslCaContent), | ||
| SSLKEYBytes: []byte(source.Security.SslKeyContent), | ||
| SSLCertBytes: []byte(source.Security.SslCertContent), | ||
| } | ||
| if source.Security.CertAllowedCn != nil { | ||
| from.Security.CertAllowedCN = *source.Security.CertAllowedCn | ||
| } | ||
| } | ||
| cfg.From = from | ||
| cfg.EnableGTID = source.EnableGtid | ||
| cfg.SourceID = source.SourceName | ||
| if purge := source.Purge; purge != nil { | ||
| if purge.Expires != nil { | ||
| cfg.Purge.Expires = *purge.Expires | ||
| } | ||
| if purge.Interval != nil { | ||
| cfg.Purge.Interval = *purge.Interval | ||
| } | ||
| if purge.RemainSpace != nil { | ||
| cfg.Purge.RemainSpace = *purge.RemainSpace | ||
| } | ||
| } | ||
| if relayConfig := source.RelayConfig; relayConfig != nil { | ||
| if relayConfig.EnableRelay != nil { | ||
| cfg.EnableRelay = *relayConfig.EnableRelay | ||
| } | ||
| if relayConfig.RelayBinlogGtid != nil { | ||
| cfg.RelayBinlogGTID = *relayConfig.RelayBinlogGtid | ||
| } | ||
| if relayConfig.RelayBinlogName != nil { | ||
| cfg.RelayBinLogName = *relayConfig.RelayBinlogName | ||
| } | ||
| if relayConfig.RelayDir != nil { | ||
| cfg.RelayDir = *relayConfig.RelayDir | ||
| } | ||
| } | ||
| return cfg | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // Copyright 2021 PingCAP, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package config | ||
|
|
||
| import ( | ||
| "github.com/pingcap/check" | ||
| "github.com/pingcap/ticdc/dm/openapi/fixtures" | ||
| ) | ||
|
|
||
| func (t *testConfig) TestConverterWithSourceAndOpenAPISource(c *check.C) { | ||
| sourceCfg1, err := LoadFromFile(sourceSampleFile) | ||
| c.Assert(err, check.IsNil) | ||
|
|
||
| // 1. test user create source from dmctl, after convert to openapi.Source then convert back to source config | ||
| sourceCfg2 := OpenAPISourceToSourceCfg(SourceCfgToOpenAPISource(sourceCfg1)) | ||
|
|
||
| // we need set ServerID and MaxAllowedPacket manually, because user don't need to config those field in openapi | ||
| sourceCfg2.ServerID = sourceCfg1.ServerID | ||
| sourceCfg2.From.MaxAllowedPacket = sourceCfg1.From.MaxAllowedPacket | ||
|
|
||
| // we only need to make sure the source config that user can see is the same as the source config that user create | ||
| c.Assert(sourceCfg1.String(), check.Equals, sourceCfg2.String()) | ||
|
|
||
| // 2. test user create source from openapi, after convert to source config then convert back to openapi.Source | ||
| openapiSource1, err := fixtures.GenOpenAPISourceForTest() | ||
| c.Assert(err, check.IsNil) | ||
| openapiSource2 := SourceCfgToOpenAPISource(OpenAPISourceToSourceCfg(openapiSource1)) | ||
| openapiSource2.Password = openapiSource1.Password // we set passwd to "******" for privacy | ||
| c.Assert(openapiSource1, check.DeepEquals, openapiSource2) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| // Copyright 2021 PingCAP, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package fixtures | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
|
|
||
| "github.com/pingcap/ticdc/dm/openapi" | ||
| ) | ||
|
|
||
| var sourceStr = ` | ||
| { | ||
| "source_name": "mysql-01", | ||
| "host": "127.0.0.1", | ||
| "port": 3306, | ||
| "user": "root", | ||
| "password": "123456", | ||
| "enable_gtid": false, | ||
| "security": { | ||
| "ssl_ca_content": "", | ||
| "ssl_cert_content": "", | ||
| "ssl_key_content": "", | ||
| "cert_allowed_cn": [ | ||
| "string" | ||
| ] | ||
| }, | ||
| "purge": { | ||
| "interval": 3600, | ||
| "expires": 0, | ||
| "remain_space": 15 | ||
| }, | ||
| "relay_config": { | ||
| "enable_relay": true, | ||
| "relay_binlog_name": "mysql-bin.000002", | ||
| "relay_binlog_gtid": "e9a1fc22-ec08-11e9-b2ac-0242ac110003:1-7849", | ||
| "relay_dir": "./relay_log" | ||
| } | ||
| } | ||
| ` | ||
|
|
||
| // GenOpenAPISourceForTest generates openapi.Source for test. | ||
| func GenOpenAPISourceForTest() (openapi.Source, error) { | ||
| s := openapi.Source{} | ||
| err := json.Unmarshal([]byte(sourceStr), &s) | ||
| return s, err | ||
| } |
Oops, something went wrong.