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

Example NixOps State Backends #1264

Merged
merged 80 commits into from
Jul 7, 2021
Merged

Example NixOps State Backends #1264

merged 80 commits into from
Jul 7, 2021

Commits on Jul 7, 2021

  1. Remove flake support 

    This support was half-baked and needs rethinking.
    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    61d39d7 View commit details
    Browse the repository at this point in the history

  2. Add deploy without creating a state file

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    6a8289b View commit details
    Browse the repository at this point in the history

  3. add_common_{modify,deployment}_options: add types

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    e9426b0 View commit details
    Browse the repository at this point in the history

  4. Begin to describe an API for storage backends

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    2292ee3 View commit details
    Browse the repository at this point in the history

  5. script_defs: accept a network file, not a state file

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    29388ae View commit details
    Browse the repository at this point in the history

  6. evaluation: parse out storage provider data

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    ba716a4 View commit details
    Browse the repository at this point in the history

  7. deployment: HACK: make the network.nix always part of the nix exprs

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    3ee765d View commit details
    Browse the repository at this point in the history

  8. network_state: use a storage backend

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    5515e92 View commit details
    Browse the repository at this point in the history

  9. LegacyBackend: init

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    952beb7 View commit details
    Browse the repository at this point in the history

  10. MemoryBackend: init

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    81717db View commit details
    Browse the repository at this point in the history

  11. fixup d6b34b2: storage API: use Mapping over Dict

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    bb64023 View commit details
    Browse the repository at this point in the history

  12. fixup d6b34b2: storage API: drop the arguments junk

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    41f658a View commit details
    Browse the repository at this point in the history

  13. eval network: use ImmutableValidatedObject for good errors 

    Parse the result of evaluating the network's `network` argument
as a typed mapping. Extend this validation to the Storage params.
    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    8a59a58 View commit details
    Browse the repository at this point in the history

  14. nixops.exceptions: add NixError for Nix-related problems

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    97c4a41 View commit details
    Browse the repository at this point in the history

  15. eval_network, eval_attrs: handle missing 'network'

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    b3c0fa5 View commit details
    Browse the repository at this point in the history

  16. eval_network: check the network property is a dictionary

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    bfa6ffc View commit details
    Browse the repository at this point in the history

  17. add a test for when the network.nix has no network attr

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    c2335f2 View commit details
    Browse the repository at this point in the history

  18. add a test for when the network.nix's network is of the wrong type

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    9a59a3e View commit details
    Browse the repository at this point in the history

  19. Add a test for when the network's value is an empty attrset

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    f45fcf9 View commit details
    Browse the repository at this point in the history

  20. util: ImmutableValidatedObject: don't set _frozen(?)

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    1b45714 View commit details
    Browse the repository at this point in the history

  21. storage backends: strengthen typecheck, making T invariant 

    Before, a single storage backend could use a different T at every
call site. Not anymore, the T's must be aligned.

Co-authored-by: Adam Höse <[email protected]>
    @grahamc @adisbladis
    2 people authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    2ff99b5 View commit details
    Browse the repository at this point in the history

  22. storage backends: simplify options() type: just handle kwargs, return… 

    … options type

The return type of Callable[..., T] and Type[T] were mixed up and confusing mypy.

Co-authored-by: Adam Höse <[email protected]>
    @grahamc @adisbladis
    2 people authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    1e8aa36 View commit details
    Browse the repository at this point in the history

  23. locks: init protocol with a noop

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    d85ba2c View commit details
    Browse the repository at this point in the history

  24. evaluation.nix: handle Lock configuration too

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    76ff3a3 View commit details
    Browse the repository at this point in the history

  25. Use the network's lock when accessing its state

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    7202a10 View commit details
    Browse the repository at this point in the history

  26. Squash with 869d276

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    ad87a56 View commit details
    Browse the repository at this point in the history

  27. Squash with 869d276

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    98ea4cc View commit details
    Browse the repository at this point in the history

  28. storage: fixup handling of edge casesin network parsing

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    310bada View commit details
    Browse the repository at this point in the history

  29. ImmutableValidatedObject: support validating Unions with nested Immut… 

    …ableValidatedObject

Co-authored-by: Adam Höse <[email protected]>
    @grahamc @adisbladis
    2 people authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    524a2d5 View commit details
    Browse the repository at this point in the history

  30. Add and improve slome storage test expressions

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    1304da4 View commit details
    Browse the repository at this point in the history

  31. Add some test expressions for locks

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    f3f6d4d View commit details
    Browse the repository at this point in the history

  32. fixup d2f845a with no locking indications

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    0f1d687 View commit details
    Browse the repository at this point in the history

  33. fixup f52369f^C

    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    a2e25f1 View commit details
    Browse the repository at this point in the history

  34. Split argument parser into it's own file 

    Just to make things more manageable
    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    87b64d8 View commit details
    Browse the repository at this point in the history

  35. Fix internal plugin

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    a389d39 View commit details
    Browse the repository at this point in the history

  36. Memory storage: Run modify_deployment() when creating internal state 

    Otherwise `nixops info` & friends will think the deployment is not
created and no machines show up.
    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    e385752 View commit details
    Browse the repository at this point in the history

  37. Remove template support

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    2543248 View commit details
    Browse the repository at this point in the history

  38. nit: Use os.path.join instead of stringly concat

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    f7d6219 View commit details
    Browse the repository at this point in the history

  39. Remove the positional nix_exprs argument from modify commands 

    This is is conflicting with `--network` that _needs_ to be available
for all subcommands.
    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    0a68459 View commit details
    Browse the repository at this point in the history

  40. op_list: Fix calculation of number of machines & types

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    2120542 View commit details
    Browse the repository at this point in the history

  41. locks/storage plugins: access via Manager, eliminate global vars 

    Author: Adam Höse
    @grahamc @adisbladis
    grahamc authored and adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    bc25d83 View commit details
    Browse the repository at this point in the history

  42. Add command to unlock the deployment lock 

    In case a lock is acquired but nevere released.
    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    d754007 View commit details
    Browse the repository at this point in the history

  43. Use git to find project root in development shell 

    `builtins.toString ./.` resolves to a store path when using flakes.
We want the mutable paths as environment variables, not the store paths.
    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    08d9d81 View commit details
    Browse the repository at this point in the history

  44. Remove xml

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    737e8bd View commit details
    Browse the repository at this point in the history

  45. Remove non-json option show 

    This will simplify eval and was of questionable value.
    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    e64611e View commit details
    Browse the repository at this point in the history

  46. Unify nix-instantiate calls

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    4ae8d5d View commit details
    Browse the repository at this point in the history

  47. Move all evaluation logic to evaluation.py

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    7cd5184 View commit details
    Browse the repository at this point in the history

  48. evaluation.py: Handle network arguments

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    3df656c View commit details
    Browse the repository at this point in the history

  49. evaluation: Completely unify evaluation in the eval python function

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    80bb68f View commit details
    Browse the repository at this point in the history

  50. Re-introduce flakes support 

    But only in the nix expression evaluation, not the python code.
    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    db696e2 View commit details
    Browse the repository at this point in the history

  51. Fix unification of evaluation logic

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    5f54070 View commit details
    Browse the repository at this point in the history

  52. Move more evaluation logic from deployment to evaluation module

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    26ad1c6 View commit details
    Browse the repository at this point in the history

  53. Use evaluation module for machine evaluation 

    And offload realisation to nix-store -r
    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    9451aae View commit details
    Browse the repository at this point in the history

  54. Convert bootstrap network eval to use the eval method

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    92f5fd5 View commit details
    Browse the repository at this point in the history

  55. Fix deployment when network is a flake

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    5379e0c View commit details
    Browse the repository at this point in the history

  56. Fix show arguments for flakes

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    33ada85 View commit details
    Browse the repository at this point in the history

  57. Always set a network expression

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    ccfa30f View commit details
    Browse the repository at this point in the history

  58. Default is_flake to false

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    80049f1 View commit details
    Browse the repository at this point in the history

  59. Remove obsolete tests

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    e4873c3 View commit details
    Browse the repository at this point in the history

  60. Add a plugin entry point 

    Otherwise nixops core plugins can't be found from other plugin repos.
    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    2cad90d View commit details
    Browse the repository at this point in the history

  61. nixops/__main__.py: Add more static typing

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    47cf418 View commit details
    Browse the repository at this point in the history

  62. nixops/backends/__init__.py: Add more static typing

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    b05052e View commit details
    Browse the repository at this point in the history

  63. nixops/backends/none.py: Add more static typing

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    b879324 View commit details
    Browse the repository at this point in the history

  64. nixops/deployment.py: Add more static typing

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    8256550 View commit details
    Browse the repository at this point in the history

  65. nixops/nix_expr.py: Add more static typing

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    9687d74 View commit details
    Browse the repository at this point in the history

  66. nixops/plugins/__init__.py: Add more static typing

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    a92ebfe View commit details
    Browse the repository at this point in the history

  67. nixops/plugins/manager.py: Add more static typing

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    b3bad1c View commit details
    Browse the repository at this point in the history

  68. nixops/resources/__init__.py: Add more static typing

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    7ce24cf View commit details
    Browse the repository at this point in the history

  69. nixops/resources/ssh_keypair.py: Add more static typing

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    e48422a View commit details
    Browse the repository at this point in the history

  70. nixops/script_defs.py: Add more static typing

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    9feab77 View commit details
    Browse the repository at this point in the history

  71. nixops/plugins/__init__.py: Add more static typing

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    6bcdee4 View commit details
    Browse the repository at this point in the history

  72. nixops/plugins/manager.py: Add more static typing

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    0c83259 View commit details
    Browse the repository at this point in the history

  73. nixops/util.py: Add more static typing

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    5f542a0 View commit details
    Browse the repository at this point in the history

  74. Reduce nix-instantiate calls from 3 to 2

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    7d81a21 View commit details
    Browse the repository at this point in the history

  75. Remove all traces of s3 storage/locking implementations

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    4ea1728 View commit details
    Browse the repository at this point in the history

  76. Rename network.nix to nixops.nix 

    `nixops.nix` is a much more obvious name and really indicates what
tooling is supposed to be used to build/deploy by just eyeballing
a directory layout.

We also don't want to occupy generic words possibly already used in some deployments.
    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    bc31429 View commit details
    Browse the repository at this point in the history

  77. Add migration step docs

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    d87cf56 View commit details
    Browse the repository at this point in the history

  78. Add state migration docs

    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    b2b79b4 View commit details
    Browse the repository at this point in the history

  79. Fix output of migration error message to not include internal paramet… 

    …ers such as is_flake
    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    e14c835 View commit details
    Browse the repository at this point in the history

  80. Remove TODO from migration error message output 

    This will soon contain a reference to readthedocs.
    @adisbladis
    adisbladis committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    3f7d77a View commit details
    Browse the repository at this point in the history