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.

Sign up for GitHub

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

Jump to bottom

Update deprecated imports #6088

Merged
merged 7 commits into from
Mar 24, 2020
Merged

Update deprecated imports #6088

merged 7 commits into from
Mar 24, 2020

Conversation

mgarabed
Copy link
Member

Motivation

Prior to implementing #6081 as part of CI, these changes would be merged to update all of our code to import from the recommended base package.

@mgarabed mgarabed requested review from a team as code owners March 18, 2020 14:09
@codecov
Copy link

codecov bot commented Mar 18, 2020 •
edited
Loading

Codecov Report

Merging #6088 into master will increase coverage by 1.99%.
The diff coverage is 100.00%.

Impacted Files Coverage Δ
...atadog_checks/active_directory/active_directory.py 100.00% <100.00%> (ø)
...mq_xml/datadog_checks/activemq_xml/activemq_xml.py 75.24% <100.00%> (ø)
activemq_xml/tests/common.py 100.00% <100.00%> (ø)
ambari/tests/test_ambari.py 100.00% <100.00%> (ø)
btrfs/datadog_checks/btrfs/btrfs.py 58.03% <100.00%> (ø)
cacti/datadog_checks/cacti/cacti.py 82.43% <100.00%> (ø)
...og_checks/cassandra_nodetool/cassandra_nodetool.py 88.88% <100.00%> (ø)
ceph/datadog_checks/ceph/ceph.py 86.56% <100.00%> (ø)
cilium/tests/conftest.py 86.95% <100.00%> (ø)
cisco_aci/datadog_checks/cisco_aci/cisco.py 64.91% <100.00%> (ø)
... and 641 more

@mgarabed
Copy link
Member Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@mgarabed mgarabed mentioned this pull request Mar 19, 2020
Merged
@mgarabed mgarabed force-pushed the mgarabed/fix-imports branch 2 times, most recently from ec6e9bb to ceb21ee Compare March 19, 2020 20:45
@mgarabed mgarabed force-pushed the mgarabed/fix-imports branch from ceb21ee to 18ff2a9 Compare March 19, 2020 21:15
@mgarabed
Copy link
Member Author

Current windows failure due to changed URL for odbc driver. Will address in separate PR.

This line:

integrations-core/.azure-pipelines/scripts/sqlserver/windows/32_install_odbc.bat

Line 3 in 887524a

powershell -Command "Invoke-WebRequest https://download.microsoft.com/download/E/6/B/E6BFDC7A-5BCD-4C51-9912-635646DA801E/en-US/msodbcsql_17.3.1.1_x64.msi -OutFile msodbcsql.msi"

Needs to reference this URL now: https://download.microsoft.com/download/E/6/B/E6BFDC7A-5BCD-4C51-9912-635646DA801E/en-US/17.5.2.1/x64/msodbcsql.msi

florimondmanca
florimondmanca suggested changes Mar 20, 2020
View reviewed changes
Copy link
Contributor

@florimondmanca florimondmanca left a comment

Choose a reason for hiding this comment

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

Great bit of work! Left a few questions related whether we should prefer package-level imports…

activemq_xml/datadog_checks/activemq_xml/activemq_xml.py Outdated Show resolved Hide resolved
activemq_xml/datadog_checks/activemq_xml/activemq_xml.py Show resolved Hide resolved
directory/datadog_checks/directory/directory.py Outdated Show resolved Hide resolved
mgarabed and others added 2 commits March 20, 2020 09:11
@mgarabed @florimondmanca
Update base check
b392a6b 
Co-Authored-By: Florimond Manca <florimond.manca@gmail.com>
@mgarabed
Use package level import where available
7e51885
florimondmanca
florimondmanca approved these changes Mar 24, 2020
View reviewed changes
Copy link
Contributor

@florimondmanca florimondmanca left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Fantastic! 💯 (Gitlab tests failed due to an unrelated no space left on device, so should be good to merge)

@mgarabed mgarabed merged commit c1f7fd7 into master Mar 24, 2020
@mgarabed mgarabed deleted the mgarabed/fix-imports branch March 24, 2020 12:19
@florimondmanca florimondmanca mentioned this pull request Mar 24, 2020
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@florimondmanca florimondmanca florimondmanca approved these changes

Assignees
No one assigned
Labels
integration/active_directory integration/activemq_xml integration/aerospike integration/ambari integration/btrfs integration/cacti integration/cassandra_nodetool integration/ceph integration/cilium integration/cisco_aci integration/cockroachdb integration/coredns integration/couch integration/couchbase integration/crio integration/directory integration/dns_check integration/ecs_fargate integration/envoy integration/fluentd integration/gearmand integration/gitlab_runner integration/gitlab integration/go_expvar integration/gunicorn integration/haproxy integration/http_check integration/ibm_mq integration/iis integration/istio integration/kong integration/kube_apiserver_metrics integration/kube_controller_manager integration/kube_dns integration/kube_proxy integration/kube_scheduler integration/kubelet integration/kubernetes_state integration/kyototycoon integration/lighttpd integration/linkerd integration/linux_proc_extras integration/marathon integration/mesos_master integration/mesos_slave integration/nfsstat integration/nginx_ingress_controller integration/openldap integration/openmetrics integration/openstack integration/pdh_check integration/pgbouncer integration/php_fpm integration/postfix integration/powerdns_recursor integration/process integration/prometheus integration/rabbitmq integration/riak integration/riakcs integration/snmp integration/sqlserver integration/squid integration/ssh_check integration/statsd integration/supervisord integration/system_core integration/system_swap integration/teamcity integration/tokumx integration/varnish integration/vsphere integration/windows_service integration/wmi_check integration/yarn integration/zk
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mgarabed @florimondmanca @therve