Fix unarchiving a repo

scripts/__tests__/yaml/config.test.ts

@@ -12,6 +12,8 @@ import {RepositoryFile} from '../../src/resources/repository-file'
 import {randomUUID} from 'crypto'
 import {Team, Privacy as TeamPrivacy} from '../../src/resources/team'
 import {RepositoryBranchProtectionRule} from '../../src/resources/repository-branch-protection-rule'
+import {toggleArchivedRepos} from '../../src/actions/shared/toggle-archived-repos'
+import * as state from '../../src/terraform/state'
 
 test('can retrieve resources from YAML schema', async () => {
   const config = Config.FromPath()
@@ -385,3 +387,43 @@ test('can add and remove resources through sync', async () => {
   resources = config.getAllResources()
   expect(resources).toHaveLength(desiredResources.length)
 })
+
+test('clears and re-adds repository fields when archiving/unarchiving', async () => {
+  let config = Config.FromPath()
+
+  const unarchivedRepo = config.getResources(Repository).find(r => !r.archived)!
+
+  expect(unarchivedRepo.visibility).toBeDefined()
+
+  unarchivedRepo.archived = true
+  config.addResource(unarchivedRepo)
+
+  await toggleArchivedRepos(config)
+
+  const archivedRepo = config
+    .getResources(Repository)
+    .find(r => r.getStateAddress() == unarchivedRepo.getStateAddress())!
+
+  expect(archivedRepo.archived).toBe(true)
+  expect(archivedRepo.visibility).not.toBeDefined()
+
+  archivedRepo.archived = false
+  config.addResource(archivedRepo)
+
+  const newState = JSON.parse(await state.loadState())
+  newState.values.root_module.resources.find(
+    (r: any) => r.address == unarchivedRepo.getStateAddress()
+  )!.values.archived = true
+
+  const loadStateMock = jest.spyOn(state, 'loadState')
+  loadStateMock.mockImplementation(async () => JSON.stringify(newState))
+
+  await toggleArchivedRepos(config)
+
+  const toggledRepo = config
+    .getResources(Repository)
+    .find(r => r.getStateAddress() == unarchivedRepo.getStateAddress())!
+
+  expect(toggledRepo.archived).toBe(false)
+  expect(toggledRepo.visibility).toBeDefined()
+})

scripts/src/actions/fix-yaml-config.ts

@@ -1,12 +1,15 @@
 import 'reflect-metadata'
 
+import {Config} from '../yaml/config'
 import {toggleArchivedRepos} from './shared/toggle-archived-repos'
 import {describeAccessChanges} from './shared/describe-access-changes'
 
 import * as core from '@actions/core'
 
 async function run(): Promise<void> {
-  await toggleArchivedRepos()
+  const config = Config.FromPath()
+  await toggleArchivedRepos(config)
+  config.save()
 
   const accessChangesDescription = await describeAccessChanges()
 

scripts/src/actions/shared/toggle-archived-repos.ts

@@ -2,9 +2,8 @@ import {Config} from '../../yaml/config'
 import {Repository} from '../../resources/repository'
 import {State} from '../../terraform/state'
 
-export async function toggleArchivedRepos(): Promise<void> {
+export async function toggleArchivedRepos(config: Config): Promise<void> {
   const state = await State.New()
-  const config = Config.FromPath()
 
   const resources = state.getAllResources()
   const stateRepositories = state.getResources(Repository)
@@ -21,6 +20,7 @@ export async function toggleArchivedRepos(): Promise<void> {
         r => r.name === configRepository.name
       )
       if (stateRepository !== undefined && stateRepository.archived) {
+        stateRepository.archived = false
         config.addResource(stateRepository)
         for (const resource of resources) {
           if (
@@ -33,6 +33,4 @@ export async function toggleArchivedRepos(): Promise<void> {
       }
     }
   }
-
-  config.save()
 }

scripts/src/main.ts

@@ -14,7 +14,11 @@ async function runSync(): Promise<void> {
 }
 
 async function runToggleArchivedRepos(): Promise<void> {
-  await toggleArchivedRepos()
+  const config = Config.FromPath()
+
+  await toggleArchivedRepos(config)
+
+  config.save()
 }
 
 async function run(): Promise<void> {