[SOLVED] Multiple matrix permutation

I’m trying to parallelize a kv job, but essentially I have 2 groups that share some kvs but not others and have different parameters. I tried to boil it down with a matrix but ran into the problem that conditionals only work for a ‘single matrix permutation’. What I need is to select multiple permutations. Example:

matrix:
  include:
    - CLUSTER: cloud1
      VAR: token1
      PROXY: key1
    - CLUSTER: cloud2
      VAR: token2
      PROXY: key2
    - CLUSTER: local1
      VAR: token3
    - CLUSTER: local2
      VAR: token4

pipeline:
  dry-run-cloud
    when:
      event: pull_request
      matrix:
        CLUSTER: [ cloud1, cloud2 ]
    token:
      - ${VAR}
    proxy: ${PROXY}
    ...

  dry-run-local:
    when:
      event: pull_request
      matrix:
        CLUSTER: [ local1, local2 ]
    token:
      - ${VAR}
    ...

Currently this does not work, it seems drone only does ‘All’ or ‘1’ for matrix selector? When I coded my .drone.yml as above, it went from ~500 lines down to ~150 and was much more readable. Is there a way to make this work? or should I file a feature request?
Thanks!

Ok figured it out…
This works:

matrix:
  include:
    - CLUSTER: cloud1
      VAR: token1
      PROXY: key1
      ENV: cloud
    - CLUSTER: cloud2
      VAR: token2
      PROXY: key2
      ENV: cloud
    - CLUSTER: local1
      VAR: token3
      ENV: local
    - CLUSTER: local2
      VAR: token4
      ENV: local

pipeline:
  dry-run-cloud
    when:
      event: pull_request
      matrix:
        ENV: cloud
    token:
      - ${VAR}
    proxy: ${PROXY}
    ...

  dry-run-local:
    when:
      event: pull_request
      matrix:
        ENV: local
    token:
      - ${VAR}
    ...

It appears, however, that we cannot pass secrets through the matrix, so there goes that idea…