Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixops-aws
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2d644deec9cc
Choose a base ref
...
head repository: NixOS/nixops-aws
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 085372438945
Choose a head ref
2 contributors

Commits on May 21, 2020

  1. pyproject.toml: update to nixops master

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    globin Robin Gloster
    GPG key ID: D5C458DF6DD97EDF
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    05b815b View commit details

  2. mypy: add some rules and ignore boto errors

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    globin Robin Gloster
    GPG key ID: D5C458DF6DD97EDF
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2242145 View commit details

  3. pre stubs

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    b94fd1a View commit details

  4. sqs_queue: use _connect() to get a connection

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    e995d8e View commit details

  5. sqs_queue: provide config via the new Definiton API

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    bd4668f View commit details

  6. add stubs for boto3

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    8aeaf5e View commit details

  7. sns_topic: access client via _connect()

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    e018d8f View commit details

  8. connect() and _conn -> _connect() to confidently return a client

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    84f065d View commit details

  9. connect_vpc,_conn_vpc -> _connect_vpc()

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    9e89fc6 View commit details

  10. connect_route53,_conn_route53 -> _connect_route53()

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    f5c4d8a View commit details

  11. connect_boto3,_conn_boto3 -> _connect_boto3()

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    1e426e1 View commit details

  12. Refactor SQSQueue to use ResourceOptions

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    0d020e7 View commit details

  13. nixops: use editable source

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    5d2026e View commit details

  14. sqs-queue: fixup Options structure

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    20281c0 View commit details

  15. boto3-stubs: support ec2, sqs

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    43d63b5 View commit details

  16. s3_bucket: port

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    682314f View commit details

  17. backends/ec2: correct types in physical backup spec assignments

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    58ae55b View commit details

  18. backends/ec2: fixup mypy complaints

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    e100365 View commit details

  19. elastic_file_syste_mount_target: fixup missing second parameter

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    fdfbda6 View commit details

  20. Finish up connect refactor

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    6ae512a View commit details

  21. elatsic file system: up connect refactor

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    2b8a0dc View commit details

  22. resources/aws_vpn_connection.py: fixup mypy error

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    b31e4dd View commit details

  23. resources/aws_vpn_connection_route.py: fixup mypy

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    884dbf1 View commit details

  24. resources/aws_vpn_gateway.py: fixup mypy

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    e84d31c View commit details

  25. resources/vpc: fixup mypy

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    8be5cbf View commit details

  26. fixup imports

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    d2050cf View commit details

  27. unify connect behavior

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    708bcee View commit details

  28. fixup: trivial mypy errors

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    cbc8329 View commit details

  29. wip: rds break-out

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    5acadf3 View commit details

  30. efs_common: type, confidently pass region

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    a43adeb View commit details

  31. ec2_common: confidently refer to region

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    c8366c6 View commit details

  32. rds_dbsecurity_group: fixup imports

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    e770bcd View commit details

  33. rds dbinstance: fixing dangling ref

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    7d68d88 View commit details

  34. ec2_common: fixup mysterious state bits

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    d509622 View commit details

  35. fixup Deployment ref

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    d7b5d7c View commit details

  36. ec2_placement_group: Missing -> MISSING

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    dc77dd4 View commit details

  37. route53_recordset: fixup

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    0c5b1d4 View commit details

  38. resource initializers: pass config too

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    bfd7631 View commit details

  39. nix/* clean up whitespace

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    fc24573 View commit details

  40. resources: clean up naming

    @grahamc @adisbladis
    grahamc authored and adisbladis committed May 21, 2020
    Copy the full SHA
    5f2465d View commit details

  41. Remove all mentions of old-style XML option parsing

    @adisbladis
    adisbladis committed May 21, 2020
    Copy the full SHA
    d5275e0 View commit details

  42. Type EC2 machine

    @adisbladis
    adisbladis committed May 21, 2020
    Copy the full SHA
    5924b02 View commit details

  43. type network_interface_attachment

    @adisbladis
    adisbladis committed May 21, 2020
    Copy the full SHA
    d9bfa2d View commit details

  44. Add mypy types to get_typed_resource

    @adisbladis
    adisbladis committed May 21, 2020
    Copy the full SHA
    b5124d9 View commit details

  45. Fix incompatible type assignments

    @adisbladis
    adisbladis committed May 21, 2020
    Copy the full SHA
    a9daac4 View commit details

  46. Fix EFS types

    @adisbladis
    adisbladis committed May 21, 2020
    Copy the full SHA
    67e7a6d View commit details

  47. Wrong import paths

    @adisbladis
    adisbladis committed May 21, 2020
    Copy the full SHA
    ee35346 View commit details

  48. Make get_machine() return the EC2 specific machine type

    @adisbladis
    adisbladis committed May 21, 2020
    Copy the full SHA
    a6f09d0 View commit details

  49. ignore machine type for key_pair 

    There isn't a good way for us to "upsert" the type into an ec2
compatible one.
    @adisbladis
    adisbladis committed May 21, 2020
    Copy the full SHA
    56c3813 View commit details

Commits on May 27, 2020

  1. Remove with from lib.nix

    @adisbladis
    adisbladis committed May 27, 2020
    Copy the full SHA
    1c297b1 View commit details
Showing with 2,270 additions and 700 deletions.
  1. +15 −0 .flake8
  2. +20 −2 .github/workflows/ci.yaml
  3. +0 −1 nixops_aws/backends/__init__.py
  4. +163 −142 nixops_aws/backends/ec2.py
  5. +84 −0 nixops_aws/backends/options.py
  6. +6 −8 nixops_aws/ec2_utils.py
  7. +1 −1 nixops_aws/nix/aws-vpn-connection-route.nix
  8. +0 −1 nixops_aws/nix/default.nix
  9. +1 −0 nixops_aws/nix/ec2.nix
  10. +3 −6 nixops_aws/nix/lib.nix
  11. +0 −1 nixops_aws/nix/route53.nix
  12. +5 −5 nixops_aws/nix/vpc-dhcp-options.nix
  13. +1 −1 nixops_aws/nix/vpc-endpoint.nix
  14. +41 −0 nixops_aws/resources/__init__.py
  15. +14 −6 nixops_aws/resources/aws_vpn_connection.py
  16. +15 −7 nixops_aws/resources/aws_vpn_connection_route.py
  17. +9 −1 nixops_aws/resources/aws_vpn_gateway.py
  18. +17 −13 nixops_aws/resources/cloudwatch_log_group.py
  19. +18 −14 nixops_aws/resources/cloudwatch_log_stream.py
  20. +32 −24 nixops_aws/resources/cloudwatch_metric_alarm.py
  21. +19 −16 nixops_aws/resources/ebs_volume.py
  22. +24 −7 nixops_aws/resources/ec2_common.py
  23. +24 −23 nixops_aws/resources/ec2_keypair.py
  24. +19 −19 nixops_aws/resources/ec2_placement_group.py
  25. +31 −45 nixops_aws/resources/ec2_rds_dbinstance.py
  26. +43 −6 nixops_aws/resources/ec2_rds_dbsecurity_group.py
  27. +49 −53 nixops_aws/resources/ec2_security_group.py
  28. +21 −8 nixops_aws/resources/efs_common.py
  29. +9 −4 nixops_aws/resources/elastic_file_system.py
  30. +11 −5 nixops_aws/resources/elastic_file_system_mount_target.py
  31. +21 −13 nixops_aws/resources/elastic_ip.py
  32. +34 −35 nixops_aws/resources/iam_role.py
  33. +34 −25 nixops_aws/resources/route53_health_check.py
  34. +16 −10 nixops_aws/resources/route53_hosted_zone.py
  35. +32 −26 nixops_aws/resources/route53_recordset.py
  36. +23 −22 nixops_aws/resources/s3_bucket.py
  37. +19 −15 nixops_aws/resources/sns_topic.py
  38. +19 −20 nixops_aws/resources/sqs_queue.py
  39. 0 nixops_aws/resources/types/__init__.py
  40. +12 −0 nixops_aws/resources/types/aws_vpn_connection.py
  41. +10 −0 nixops_aws/resources/types/aws_vpn_connection_route.py
  42. +11 −0 nixops_aws/resources/types/aws_vpn_gateway.py
  43. +10 −0 nixops_aws/resources/types/cloudwatch_log_group.py
  44. +9 −0 nixops_aws/resources/types/cloudwatch_log_stream.py
  45. +73 −0 nixops_aws/resources/types/cloudwatch_metric_alarm.py
  46. +23 −0 nixops_aws/resources/types/ebs_volume.py
  47. +7 −0 nixops_aws/resources/types/ec2_keypair.py
  48. +8 −0 nixops_aws/resources/types/ec2_placement_group.py
  49. +18 −0 nixops_aws/resources/types/ec2_rds_dbinstance.py
  50. +18 −0 nixops_aws/resources/types/ec2_rds_dbsecurity_group.py
  51. +28 −0 nixops_aws/resources/types/ec2_security_group.py
  52. +8 −0 nixops_aws/resources/types/elastic_file_system.py
  53. +14 −0 nixops_aws/resources/types/elastic_file_system_mount_target.py
  54. +8 −0 nixops_aws/resources/types/elastic_ip.py
  55. +8 −0 nixops_aws/resources/types/iam_role.py
  56. +41 −0 nixops_aws/resources/types/route53_health_check.py
  57. +15 −0 nixops_aws/resources/types/route53_hosted_zone.py
  58. +30 −0 nixops_aws/resources/types/route53_recordset.py
  59. +21 −0 nixops_aws/resources/types/s3_bucket.py
  60. +18 −0 nixops_aws/resources/types/sns_topic.py
  61. +10 −0 nixops_aws/resources/types/sqs_queue.py
  62. +16 −0 nixops_aws/resources/types/vpc.py
  63. +12 −0 nixops_aws/resources/types/vpc_customer_gateway.py
  64. +17 −0 nixops_aws/resources/types/vpc_dhcp_options.py
  65. +8 −0 nixops_aws/resources/types/vpc_egress_only_internet_gateway.py
  66. +13 −0 nixops_aws/resources/types/vpc_endpoint.py
  67. +10 −0 nixops_aws/resources/types/vpc_internet_gateway.py
  68. +9 −0 nixops_aws/resources/types/vpc_nat_gateway.py
  69. +28 −0 nixops_aws/resources/types/vpc_network_acl.py
  70. +18 −0 nixops_aws/resources/types/vpc_network_interface.py
  71. +10 −0 nixops_aws/resources/types/vpc_network_interface_attachment.py
  72. +16 −0 nixops_aws/resources/types/vpc_route.py
  73. +12 −0 nixops_aws/resources/types/vpc_route_table.py
  74. +9 −0 nixops_aws/resources/types/vpc_route_table_association.py
  75. +16 −0 nixops_aws/resources/types/vpc_subnet.py
  76. +7 −2 nixops_aws/resources/vpc.py
  77. +4 −0 nixops_aws/resources/vpc_customer_gateway.py
  78. +10 −5 nixops_aws/resources/vpc_dhcp_options.py
  79. +10 −4 nixops_aws/resources/vpc_egress_only_internet_gateway.py
  80. +12 −6 nixops_aws/resources/vpc_endpoint.py
  81. +10 −4 nixops_aws/resources/vpc_internet_gateway.py
  82. +13 −7 nixops_aws/resources/vpc_nat_gateway.py
  83. +21 −10 nixops_aws/resources/vpc_network_acl.py
  84. +14 −12 nixops_aws/resources/vpc_network_interface.py
  85. +21 −12 nixops_aws/resources/vpc_network_interface_attachment.py
  86. +13 −8 nixops_aws/resources/vpc_route.py
  87. +12 −5 nixops_aws/resources/vpc_route_table.py
  88. +12 −8 nixops_aws/resources/vpc_route_table_association.py
  89. +11 −6 nixops_aws/resources/vpc_subnet.py
  90. +7 −1 overrides.nix
  91. +581 −20 poetry.lock
  92. +7 −2 pyproject.toml
  93. +11 −0 setup.cfg
  94. +7 −3 tests/functional/vpc.py
15 changes: 15 additions & 0 deletions .flake8
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[flake8]
ignore = E203, E266, E501, W503
# line length is intentionally set to 80 here because black uses Bugbear
# See https://github.com/psf/black/blob/master/README.md#line-length for more details
max-line-length = 80
max-complexity = 18
select = B,C,E,F,W,T4,B9

per-file-ignores =
nixops/__main__.py:E402

# # We need to configure the mypy.ini because the flake8-mypy's default
# # options don't properly override it, so if we don't specify it we get
# # half of the config from mypy.ini and half from flake8-mypy.
# mypy_config = mypy.ini
22 changes: 20 additions & 2 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ jobs:
- name: Nix
uses: cachix/install-nix-action@v8
- name: Build
run: 'nix-build -I nixpkgs=channel:nixos-20.03 --quiet release.nix -A nixops-aws.x86_64-linux'
run: 'nix-build -I nixpkgs=channel:nixos-unstable --quiet release.nix -A nixops-aws.x86_64-linux --show-trace'
# Run black v19.10b0 and ensure no diff, using a pinned channel to ensure the
# build doesn't break when the version of black on the release channel
# upgrades. The specific commit is not special; just a commit from the
@@ -27,4 +27,22 @@ jobs:
- name: Nix
uses: cachix/install-nix-action@v8
- name: Black
run: 'nix run -I nixpkgs=https://github.com/nixos/nixpkgs-channels/archive/0729b8c55e0dfaf302af4c57546871d47a652048.tar.gz nixpkgs.python3Packages.black -c black --check .'
run: 'nix-shell ./shell.nix --run "black --check ."'
flake8:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Nix
uses: cachix/install-nix-action@v8
- name: Flake8
run: 'nix-shell ./shell.nix --run "flake8 nixops_aws"'
mypy:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Nix
uses: cachix/install-nix-action@v8
- name: Mypy
run: 'nix-shell ./shell.nix --run "mypy nixops_aws"'
1 change: 0 additions & 1 deletion nixops_aws/backends/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@

Loading