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

Remove duplicate dns configs in response connection in DNSContextClient #1318

Merged

Conversation

NikitaSkrynnik
Copy link
Contributor

Signed-off-by: Nikita Skrynnik nikita.skrynnik@xored.com

Description

Issue link

How Has This Been Tested?

  • Added unit testing to cover
  • Tested manually
  • Tested by integration testing
  • Have not tested

Types of changes

  • Bug fix
  • New functionallity
  • Documentation
  • Refactoring
  • CI

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>
Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>
Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>
Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>
@NikitaSkrynnik NikitaSkrynnik marked this pull request as ready for review July 6, 2022 10:27
Copy link
Member

@denis-tingaikin denis-tingaikin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please have a look at comment above.

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>
Comment on lines 205 to 220
func merge(a, b []string) []string {
result := a
common := make(map[string]bool, len(a))

for _, v := range a {
common[v] = true
}

for _, v := range b {
if _, ok := common[v]; !ok {
result = append(result, v)
}
}

return result
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are going a bit over-complicated here. Moreover, am not sure about merging dns configs because it could produce a ton of new unexpected states. Thus I think we need to consider about using metadata for server dnscontext.

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>
Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>
Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>
Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>
Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>
@denis-tingaikin denis-tingaikin merged commit 65679c0 into networkservicemesh:main Jul 12, 2022
nsmbot pushed a commit to networkservicemesh/cmd-map-ip-k8s that referenced this pull request Jul 12, 2022
…k@main

PR link: networkservicemesh/sdk#1318

Commit: 65679c0
Author: Nikita Skrynnik
Date: 2022-07-12 22:08:37 +1100
Message:
  - Remove duplicate dns configs in response connection in DNSContextClient (#1318)
* remove duplicate dns configs in response

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* delete metadata + add removeDuplicates before request

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* check intersections + add removeDuplicates test

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* add dns configs check on dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix ci

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSContextClient_Usecases

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* rework dns configs check in dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSUsecase

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/cmd-nse-vfio that referenced this pull request Jul 12, 2022
…k@main

PR link: networkservicemesh/sdk#1318

Commit: 65679c0
Author: Nikita Skrynnik
Date: 2022-07-12 22:08:37 +1100
Message:
  - Remove duplicate dns configs in response connection in DNSContextClient (#1318)
* remove duplicate dns configs in response

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* delete metadata + add removeDuplicates before request

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* check intersections + add removeDuplicates test

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* add dns configs check on dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix ci

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSContextClient_Usecases

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* rework dns configs check in dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSUsecase

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/cmd-nsmgr that referenced this pull request Jul 12, 2022
…k@main

PR link: networkservicemesh/sdk#1318

Commit: 65679c0
Author: Nikita Skrynnik
Date: 2022-07-12 22:08:37 +1100
Message:
  - Remove duplicate dns configs in response connection in DNSContextClient (#1318)
* remove duplicate dns configs in response

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* delete metadata + add removeDuplicates before request

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* check intersections + add removeDuplicates test

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* add dns configs check on dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix ci

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSContextClient_Usecases

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* rework dns configs check in dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSUsecase

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/sdk-kernel that referenced this pull request Jul 12, 2022
…k@main

PR link: networkservicemesh/sdk#1318

Commit: 65679c0
Author: Nikita Skrynnik
Date: 2022-07-12 22:08:37 +1100
Message:
  - Remove duplicate dns configs in response connection in DNSContextClient (#1318)
* remove duplicate dns configs in response

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* delete metadata + add removeDuplicates before request

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* check intersections + add removeDuplicates test

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* add dns configs check on dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix ci

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSContextClient_Usecases

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* rework dns configs check in dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSUsecase

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/cmd-registry-proxy-dns that referenced this pull request Jul 12, 2022
…k@main

PR link: networkservicemesh/sdk#1318

Commit: 65679c0
Author: Nikita Skrynnik
Date: 2022-07-12 22:08:37 +1100
Message:
  - Remove duplicate dns configs in response connection in DNSContextClient (#1318)
* remove duplicate dns configs in response

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* delete metadata + add removeDuplicates before request

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* check intersections + add removeDuplicates test

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* add dns configs check on dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix ci

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSContextClient_Usecases

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* rework dns configs check in dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSUsecase

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/cmd-registry-memory that referenced this pull request Jul 12, 2022
…k@main

PR link: networkservicemesh/sdk#1318

Commit: 65679c0
Author: Nikita Skrynnik
Date: 2022-07-12 22:08:37 +1100
Message:
  - Remove duplicate dns configs in response connection in DNSContextClient (#1318)
* remove duplicate dns configs in response

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* delete metadata + add removeDuplicates before request

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* check intersections + add removeDuplicates test

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* add dns configs check on dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix ci

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSContextClient_Usecases

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* rework dns configs check in dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSUsecase

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/cmd-nse-remote-vlan that referenced this pull request Jul 12, 2022
…k@main

PR link: networkservicemesh/sdk#1318

Commit: 65679c0
Author: Nikita Skrynnik
Date: 2022-07-12 22:08:37 +1100
Message:
  - Remove duplicate dns configs in response connection in DNSContextClient (#1318)
* remove duplicate dns configs in response

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* delete metadata + add removeDuplicates before request

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* check intersections + add removeDuplicates test

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* add dns configs check on dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix ci

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSContextClient_Usecases

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* rework dns configs check in dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSUsecase

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/cmd-admission-webhook-k8s that referenced this pull request Jul 12, 2022
…k@main

PR link: networkservicemesh/sdk#1318

Commit: 65679c0
Author: Nikita Skrynnik
Date: 2022-07-12 22:08:37 +1100
Message:
  - Remove duplicate dns configs in response connection in DNSContextClient (#1318)
* remove duplicate dns configs in response

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* delete metadata + add removeDuplicates before request

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* check intersections + add removeDuplicates test

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* add dns configs check on dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix ci

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSContextClient_Usecases

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* rework dns configs check in dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSUsecase

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/cmd-nsmgr-proxy that referenced this pull request Jul 12, 2022
…k@main

PR link: networkservicemesh/sdk#1318

Commit: 65679c0
Author: Nikita Skrynnik
Date: 2022-07-12 22:08:37 +1100
Message:
  - Remove duplicate dns configs in response connection in DNSContextClient (#1318)
* remove duplicate dns configs in response

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* delete metadata + add removeDuplicates before request

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* check intersections + add removeDuplicates test

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* add dns configs check on dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix ci

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSContextClient_Usecases

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* rework dns configs check in dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSUsecase

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/sdk-k8s that referenced this pull request Jul 12, 2022
…k@main

PR link: networkservicemesh/sdk#1318

Commit: 65679c0
Author: Nikita Skrynnik
Date: 2022-07-12 22:08:37 +1100
Message:
  - Remove duplicate dns configs in response connection in DNSContextClient (#1318)
* remove duplicate dns configs in response

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* delete metadata + add removeDuplicates before request

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* check intersections + add removeDuplicates test

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* add dns configs check on dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix ci

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSContextClient_Usecases

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* rework dns configs check in dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSUsecase

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/cmd-ipam-vl3 that referenced this pull request Jul 12, 2022
…k@main

PR link: networkservicemesh/sdk#1318

Commit: 65679c0
Author: Nikita Skrynnik
Date: 2022-07-12 22:08:37 +1100
Message:
  - Remove duplicate dns configs in response connection in DNSContextClient (#1318)
* remove duplicate dns configs in response

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* delete metadata + add removeDuplicates before request

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* check intersections + add removeDuplicates test

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* add dns configs check on dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix ci

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSContextClient_Usecases

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* rework dns configs check in dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSUsecase

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/cmd-nsc-init that referenced this pull request Jul 12, 2022
…k@main

PR link: networkservicemesh/sdk#1318

Commit: 65679c0
Author: Nikita Skrynnik
Date: 2022-07-12 22:08:37 +1100
Message:
  - Remove duplicate dns configs in response connection in DNSContextClient (#1318)
* remove duplicate dns configs in response

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* delete metadata + add removeDuplicates before request

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* check intersections + add removeDuplicates test

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* add dns configs check on dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix ci

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSContextClient_Usecases

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* rework dns configs check in dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSUsecase

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
anastasia-malysheva pushed a commit to anastasia-malysheva/sdk that referenced this pull request Jul 27, 2022
…nt (networkservicemesh#1318)

* remove duplicate dns configs in response

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* delete metadata + add removeDuplicates before request

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix linter

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* check intersections + add removeDuplicates test

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* add dns configs check on dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix ci

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSContextClient_Usecases

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* rework dns configs check in dnsContextServer

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

* fix Test_DNSUsecase

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>
Signed-off-by: anastasia.malysheva <anastasia.malysheva@xored.com>
@NikitaSkrynnik NikitaSkrynnik deleted the remove-duplicates branch August 7, 2023 07:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants